compilation fix

[wxWidgets.git] / include / wx / frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 646cce0a237bf82a8593d095fd4b3e875dad2200..593f4141c620ca676dee3dbf6add815d45d2b3d8 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma interface "framebase.h"
 #endif
 
     #pragma interface "framebase.h"
 #endif
 


@@ -122,9 +122,10 @@ public:
 
     // toolbar functions
     // -----------------
 
     // toolbar functions
     // -----------------

+

 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()
 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()

-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
+    virtual wxToolBar* CreateToolBar(long style = -1,

                                      wxWindowID winid = -1,
                                      const wxString& name = wxToolBarNameStr);
     // return a new toolbar
                                      wxWindowID winid = -1,
                                      const wxString& name = wxToolBarNameStr);
     // return a new toolbar


@@ -145,9 +146,9 @@ public:
     void OnMenuHighlight(wxMenuEvent& event);
 
 #if wxUSE_MENUS
     void OnMenuHighlight(wxMenuEvent& event);
 
 #if wxUSE_MENUS

-    // send wxUpdateUIEvents for all menu items (called from OnIdle())
-    void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+    // send wxUpdateUIEvents for all menu items in the menubar,
+    // or just for menu if non-NULL
+    void DoMenuUpdates(wxMenu* menu = NULL);

 #endif // wxUSE_MENUS
 
     // do the UI update processing for this window
 #endif // wxUSE_MENUS
 
     // do the UI update processing for this window