Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warning fix w/o #ifdefs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-15 19:51:45 +00:00
parent 8334c5b958
commit 012f1014df
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/taskbar/tbtest.cpp
View File

@@ -110,7 +110,7 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore) EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit) EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit)
EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon) EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
EVT_TASKBAR_LEFT_DCLICK (MyTaskBarIcon::OnLButtonDClick) EVT_TASKBAR_LEFT_DCLICK (MyTaskBarIcon::OnLeftButtonDClick)
END_EVENT_TABLE() END_EVENT_TABLE()
void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& ) void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
@@ -143,11 +143,7 @@ wxMenu *MyTaskBarIcon::CreatePopupMenu()
return menu; return menu;
} }
#if WXWIN_COMPATIBILITY_2_4 void MyTaskBarIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)
void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
#else
void MyTaskBarIcon::OnLButtonDClick(wxTaskBarIconEvent&)
#endif
{ {
dialog->Show(true); dialog->Show(true);
} }

6
samples/taskbar/tbtest.h
View File

@@ -14,11 +14,7 @@ class MyTaskBarIcon: public wxTaskBarIcon
public: public:
MyTaskBarIcon() {}; MyTaskBarIcon() {};
#if WXWIN_COMPATIBILITY_2_4 void OnLeftButtonDClick(wxTaskBarIconEvent&);
void OnLButtonDClick(wxEvent&);
#else
void OnLButtonDClick(wxTaskBarIconEvent&);
#endif
void OnMenuRestore(wxCommandEvent&); void OnMenuRestore(wxCommandEvent&);
void OnMenuExit(wxCommandEvent&); void OnMenuExit(wxCommandEvent&);
void OnMenuSetNewIcon(wxCommandEvent&); void OnMenuSetNewIcon(wxCommandEvent&);