wxGTK compilation fixes

[wxWidgets.git] / src / gtk1 / menu.cpp

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index e56b4632f77883a306eef465f944e6cb7750deea..64c2b57e440be933c59920fbaa41bf5105056b56 100644 (file)
--- 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 );
 
     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;
 
     if (menu->GetEventHandler()->ProcessEvent(event))
         return;
 


@@ -635,18 +626,13 @@ bool wxMenuItem::IsChecked() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 
 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
 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 );
 {
     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
 
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 

+#ifdef WXWIN_COMPATIBILITY

     m_callback = func;
     m_callback = func;

+#endif
+

     m_eventHandler = this;
     m_clientData = (void*) NULL;
 
     m_eventHandler = this;
     m_clientData = (void*) NULL;
 


@@ -694,7 +683,9 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
 
 wxMenu::~wxMenu()
 {
 
 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 )
 }
 
 void wxMenu::SetTitle( const wxString& title )