X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/gtk/frame.h?ds=sidebyside

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index ec5261621e..3befcf231f 100644
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -11,7 +11,7 @@
 #ifndef __GTKFRAMEH__
 #define __GTKFRAMEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "frame.h"
 #endif
 
@@ -27,15 +27,15 @@ class wxToolBar;
 class wxStatusBar;
 
 //-----------------------------------------------------------------------------
-// wxFrameGTK
+// wxFrame
 //-----------------------------------------------------------------------------
 
-class wxFrameGTK : public wxFrameBase
+class wxFrame : public wxFrameBase
 {
 public:
     // construction
-    wxFrameGTK() { Init(); }
-    wxFrameGTK(wxWindow *parent,
+    wxFrame() { Init(); }
+    wxFrame(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
                const wxPoint& pos = wxDefaultPosition,
@@ -56,23 +56,27 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxFrameGTK();
+    virtual ~wxFrame();
 
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 
     virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxST_SIZEGRIP,
+                                         long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE,
                                          wxWindowID id = 0,
                                          const wxString& name = wxStatusLineNameStr);
+                                         
+    void SetStatusBar(wxStatusBar *statbar);
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
+    virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
+    
+    wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
 
     // implementation from now on
     // --------------------------
@@ -82,6 +86,7 @@ public:
     virtual void OnInternalIdle();
 
     bool          m_menuBarDetached;
+    int           m_menuBarHeight;
     bool          m_toolBarDetached;
 
 protected:
@@ -93,9 +98,17 @@ protected:
     virtual void DoGetClientSize( int *width, int *height ) const;
 
 #if wxUSE_MENUS_NATIVE
+
     virtual void DetachMenuBar();
     virtual void AttachMenuBar(wxMenuBar *menubar);
+
+public:
+    // Menu size is dynamic now, call this whenever it might change.
+    void UpdateMenuBarSize();
+
 #endif // wxUSE_MENUS_NATIVE
+
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
 #endif // __GTKFRAMEH__