pragma fix for gcc

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index fd7e72f4d36ce68eeece9b9a82887d413c84cbf2..8d3764474078b79680132c77cf3fe9b033d83434 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -70,10 +70,6 @@ public:
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
 

-#if wxUSE_MENUS
-    virtual void SetMenuBar( wxMenuBar *menuBar );
-#endif // wxUSE_MENUS
-

 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 


@@ -134,8 +130,13 @@ protected:
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 

+#if wxUSE_MENUS_NATIVE
+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+#endif // wxUSE_MENUS_NATIVE
+

     // is the frame currently iconized?
     // is the frame currently iconized?

-    bool          m_isIconized;
+    bool m_isIconized;

 };
 
 #endif // __GTKFRAMEH__
 };
 
 #endif // __GTKFRAMEH__