X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96be256b3e1802de10f45953c41ed33bce399b54..88060820acda9b950d47c7bce37909a894cfda6b:/include/wx/motif/menu.h?ds=sidebyside

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 85cb814dc5..16ecaa5557 100644
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -12,21 +12,17 @@
 #ifndef _WX_MOTIF_MENU_H_
 #define _WX_MOTIF_MENU_H_
 
-#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;
+class WXDLLIMPEXP_CORE wxFrame;
 
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------
 
-class wxMenu : public wxMenuBase
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
 {
 public:
     // ctors & dtor
@@ -66,7 +62,7 @@ public:
     void HidePopup();
     
     WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,
-        const wxString& title = wxEmptyString,
+        size_t index, const wxString& title = wxEmptyString,
         bool isPulldown = false);
     
     // For popups, need to destroy, then recreate menu for a different (or
@@ -112,13 +108,13 @@ private:
 // Menu Bar
 // ----------------------------------------------------------------------------
 
-class wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
 {
 public:
     wxMenuBar() { Init(); }
     wxMenuBar(long WXUNUSED(style)) { Init(); }
-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
-    wxMenuBar(int n, wxMenu *menus[], const wxArrayString& 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