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

Added wxUSE_MENUS_NATIVE wrapper around DoPopupMenu to match header

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Hock
2005-01-26 21:14:19 +00:00
parent 06223aa37a
commit 065f010fe3
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/taskbar.cpp
View File

@@ -84,6 +84,7 @@ extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu,
gboolean * WXUNUSED(whatever), gboolean * WXUNUSED(whatever),
gpointer user_data ); gpointer user_data );
#if wxUSE_MENUS_NATIVE
bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y ) bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
{ {
wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
@@ -140,6 +141,7 @@ bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
return true; return true;
} }
#endif // wxUSE_MENUS_NATIVE
#endif // __WXGTK20__ #endif // __WXGTK20__
#endif // GTK_CHECK_VERSION(2, 1, 0) #endif // GTK_CHECK_VERSION(2, 1, 0)

2
src/gtk1/taskbar.cpp
View File

@@ -84,6 +84,7 @@ extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu,
gboolean * WXUNUSED(whatever), gboolean * WXUNUSED(whatever),
gpointer user_data ); gpointer user_data );
#if wxUSE_MENUS_NATIVE
bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y ) bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
{ {
wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
@@ -140,6 +141,7 @@ bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
return true; return true;
} }
#endif // wxUSE_MENUS_NATIVE
#endif // __WXGTK20__ #endif // __WXGTK20__
#endif // GTK_CHECK_VERSION(2, 1, 0) #endif // GTK_CHECK_VERSION(2, 1, 0)