X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..8b6e6947fc8fb946391740d66b140413eccb6b6c:/include/wx/univ/frame.h

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 608296c560..bfb03bf9a4 100644
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -20,36 +20,48 @@
 // wxFrame
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
-#define wxFrameNative wxFrameMSW
-#elif defined(__WXGTK__)
-#define wxFrameNative wxFrameGTK
-#elif defined(__WXMGL__)
-#define wxFrameNative wxFrameMGL
-#endif
-
-class wxFrame : public wxFrameNative
+class wxFrame : public wxFrameBase
 {
 public:
-    wxFrame();
+    wxFrame() {}
     wxFrame(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr);
+            const wxString& name = wxFrameNameStr)
+    {
+        Create(parent, id, title, pos, size, style, name);
+    }
+            
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);
 
     virtual wxPoint GetClientAreaOrigin() const;
+    virtual bool Enable(bool enable = TRUE);
 
 protected:
     void OnSize(wxSizeEvent& event);
 
+    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoSetClientSize(int width, int height);
+
 #if wxUSE_MENUS
     // override to update menu bar position when the frame size changes
     virtual void PositionMenuBar();
 #endif // wxUSE_MENUS
 
+#if wxUSE_STATUSBAR
+    // override to update statusbar position when the frame size changes
+    virtual void PositionStatusBar();
+#endif // wxUSE_MENUS
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };