Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix issue of duplicate classes with same name

Browse Source 
causing issues with some linkers
This commit is contained in:
Erwin Coumans
2017-01-06 18:15:04 -08:00
parent d37379ddc3
commit 10c7ddcb15
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp
View File

@@ -45,7 +45,7 @@ public:
CProfileIterator* profIter; CProfileIterator* profIter;
class MyMenuItems* m_menuItems; class MyMenuItems3* m_menuItems;
MyProfileWindow ( Gwen::Controls::Base* pParent) MyProfileWindow ( Gwen::Controls::Base* pParent)
: Gwen::Controls::WindowControl( pParent ), : Gwen::Controls::WindowControl( pParent ),
profIter(0) profIter(0)
@@ -247,16 +247,17 @@ public:
}; };
class MyMenuItems : public Gwen::Controls::Base class MyMenuItems3 : public Gwen::Controls::Base
{ {
public: public:
class MyProfileWindow* m_profWindow; class MyProfileWindow* m_profWindow;
MyMenuItems() :Gwen::Controls::Base(0) MyMenuItems3() :Gwen::Controls::Base(0)
{ {
} }
virtual ~MyMenuItems3() {}
void MenuItemSelect(Gwen::Controls::Base* pControl) void MenuItemSelect(Gwen::Controls::Base* pControl)
{ {
if (m_profWindow->Hidden()) if (m_profWindow->Hidden())
@@ -273,14 +274,14 @@ public:
MyProfileWindow* setupProfileWindow(GwenInternalData* data) MyProfileWindow* setupProfileWindow(GwenInternalData* data)
{ {
MyMenuItems* menuItems = new MyMenuItems; MyMenuItems3* menuItems = new MyMenuItems3;
MyProfileWindow* profWindow = new MyProfileWindow(data->pCanvas); MyProfileWindow* profWindow = new MyProfileWindow(data->pCanvas);
//profWindow->SetHidden(true); //profWindow->SetHidden(true);
profWindow->m_menuItems = menuItems; profWindow->m_menuItems = menuItems;
profWindow->profIter = CProfileManager::Get_Iterator(); profWindow->profIter = CProfileManager::Get_Iterator();
data->m_viewMenu->GetMenu()->AddItem( L"Profiler", menuItems,(Gwen::Event::Handler::Function)&MyMenuItems::MenuItemSelect); data->m_viewMenu->GetMenu()->AddItem( L"Profiler", menuItems,(Gwen::Event::Handler::Function)&MyMenuItems3::MenuItemSelect);
menuItems->m_profWindow = profWindow; menuItems->m_profWindow = profWindow;
@@ -312,4 +313,4 @@ void destroyProfileWindow(MyProfileWindow* window)
delete window; delete window;
} }
#endif //BT_NO_PROFILE #endif //BT_NO_PROFILE