X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c980c992630e94e71139660631a77ffbca8ed958..d9ea011f4d7f66c9728593c5ee10ce2c34964545:/src/gtk1/menu.cpp

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index e56b4632f7..64c2b57e44 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -501,15 +501,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
     event.SetEventObject( menu );
 
-/*   wxMSW doesn't call callback here either
-
-     if (menu->m_callback)
-     {
-        (void) (*(menu->m_callback)) (*menu, event);
-        return;
-     }
-*/
-
     if (menu->GetEventHandler()->ProcessEvent(event))
         return;
 
@@ -635,18 +626,13 @@ bool wxMenuItem::IsChecked() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
-wxMenu::wxMenu( const wxString& title, const wxFunction func, long style )
-{
-   Init(title, func, style);
-}
-
-wxMenu::wxMenu(long style)
-{
-   Init(wxEmptyString, (wxFunction) NULL, style);
-}
-
 void
-wxMenu::Init( const wxString& title, const wxFunction func, long style )
+wxMenu::Init( const wxString& title,
+              long style
+#ifdef WXWIN_COMPATIBILITY
+              , const wxFunction func
+#endif
+              )
 {
     m_title = title;
     m_items.DeleteContents( TRUE );
@@ -661,7 +647,10 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 
+#ifdef WXWIN_COMPATIBILITY
     m_callback = func;
+#endif
+
     m_eventHandler = this;
     m_clientData = (void*) NULL;
 
@@ -694,7 +683,9 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
 
 wxMenu::~wxMenu()
 {
-    /* how do we delete an item-factory ? */
+   /* how do we delete an item-factory ? */
+   gtk_widget_destroy( m_menu );
+
 }
 
 void wxMenu::SetTitle( const wxString& title )