X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..47cd661014b0bcf3311d8b6b01e87a13a04a2465:/include/wx/motif/menu.h?ds=sidebyside diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h index 50af6f3781..e130a1257b 100644 --- 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_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "menu.h" #endif #include "wx/colour.h" #include "wx/font.h" +#include "wx/arrstr.h" class wxFrame; @@ -47,14 +48,6 @@ public: 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; } @@ -93,7 +86,8 @@ public: WXWidget GetHandle() const { return m_menuWidget; } bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; } - + + void DestroyWidgetAndDetach(); public: // Motif-specific data int m_numColumns;