From: Kevin Hock <hockkn@yahoo.com>
Date: Wed, 26 Jan 2005 21:14:19 +0000 (+0000)
Subject: Added wxUSE_MENUS_NATIVE wrapper around DoPopupMenu to match header
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/065f010fe343a5a0f20c4658b053882a213a3be3

Added wxUSE_MENUS_NATIVE wrapper around DoPopupMenu to match header


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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