X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..5e711f771afdb2360f79241375411051d4bb5b1b:/include/wx/motif/menu.h

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 8e4a45a853..b4f94426d1 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_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "menu.h"
 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"
+#include "wx/arrstr.h"
 
 class wxFrame;
 
@@ -37,9 +38,9 @@ public:
     virtual ~wxMenu();
     
     // implement base class virtuals
-    virtual bool DoAppend(wxMenuItem *item);
-    virtual bool DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem *DoRemove(wxMenuItem *item);
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
     
     virtual void Break();
     
@@ -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; }
@@ -74,7 +67,7 @@ public:
     
     WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,
         const wxString& title = wxEmptyString,
-        bool isPulldown = FALSE);
+        bool isPulldown = false);
     
     // For popups, need to destroy, then recreate menu for a different (or
     // possibly same) window, since the parent may change.
@@ -88,7 +81,7 @@ public:
     void SetBackgroundColour(const wxColour& colour);
     void SetForegroundColour(const wxColour& colour);
     void SetFont(const wxFont& colour);
-    void ChangeFont(bool keepOriginalSize = FALSE);
+    void ChangeFont(bool keepOriginalSize = false);
     
     WXWidget GetHandle() const { return m_menuWidget; }
     
@@ -124,7 +117,8 @@ class wxMenuBar : public wxMenuBarBase
 public:
     wxMenuBar() { Init(); }
     wxMenuBar(long WXUNUSED(style)) { Init(); }
-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long style = 0);
     virtual ~wxMenuBar();
     
     // implement base class (pure) virtuals
@@ -164,7 +158,7 @@ public:
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
     virtual bool SetFont(const wxFont& colour);
-    void ChangeFont(bool keepOriginalSize = FALSE);
+    void ChangeFont(bool keepOriginalSize = false);
     
 public:
     // common part of all ctors