added GetHimagelist()

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

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 64ad89e2d06d04a0bc8e3271b0dd6d3bccad9c7c..b4f94426d16a6118082c68de7d16a01d54ce40fa 100644 (file)
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -67,7 +67,7 @@ public:
     
     WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,
         const wxString& title = wxEmptyString,
     
     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.
     
     // For popups, need to destroy, then recreate menu for a different (or
     // possibly same) window, since the parent may change.


@@ -81,7 +81,7 @@ public:
     void SetBackgroundColour(const wxColour& colour);
     void SetForegroundColour(const wxColour& colour);
     void SetFont(const wxFont& colour);
     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; }
     
     
     WXWidget GetHandle() const { return m_menuWidget; }
     


@@ -117,7 +117,8 @@ class wxMenuBar : public wxMenuBarBase
 public:
     wxMenuBar() { Init(); }
     wxMenuBar(long WXUNUSED(style)) { Init(); }
 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
     virtual ~wxMenuBar();
     
     // implement base class (pure) virtuals


@@ -157,7 +158,7 @@ public:
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
     virtual bool SetFont(const wxFont& colour);
     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
     
 public:
     // common part of all ctors