Call base OnInternalIdle

[wxWidgets.git] / include / wx / motif / menu.h

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 50af6f378102d70aa6f2aba1252ea4afde5f83f1..e130a1257be8b2044d15ac413a8e2eae172c53b6 100644 (file)
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -12,12 +12,13 @@
 #ifndef _WX_MOTIF_MENU_H_
 #define _WX_MOTIF_MENU_H_
 
 #ifndef _WX_MOTIF_MENU_H_
 #define _WX_MOTIF_MENU_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "menu.h"
 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"
 #pragma interface "menu.h"
 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"

+#include "wx/arrstr.h"

 
 class wxFrame;
 
 
 class wxFrame;
 


@@ -47,14 +48,6 @@ public:
     
     bool ProcessCommand(wxCommandEvent& event);
     
     
     bool ProcessCommand(wxCommandEvent& event);
     

-    wxMenu(const wxString& title, const wxFunction func)
-        : wxMenuBase(title)
-    {
-        Init();
-        
-        Callback(func);
-    }
-    

     //// Motif-specific
     WXWidget GetButtonWidget() const { return m_buttonWidget; }
     void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }
     //// Motif-specific
     WXWidget GetButtonWidget() const { return m_buttonWidget; }
     void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }


@@ -93,7 +86,8 @@ public:
     WXWidget GetHandle() const { return m_menuWidget; }
     
     bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; }
     WXWidget GetHandle() const { return m_menuWidget; }
     
     bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; }

-    
+
+    void DestroyWidgetAndDetach();

 public:
     // Motif-specific data
     int               m_numColumns;
 public:
     // Motif-specific data
     int               m_numColumns;