X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87d1e11fd413212a7eacc745bf28a583cc63e65b..f855e630cc1f05707835d796f5338de1fe68bd2f:/include/wx/msw/frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 33dfa21c1d..9038a6e60b 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -22,6 +22,7 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
@@ -54,14 +55,24 @@ public:
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy(void);
+
   void SetClientSize(int width, int height);
+  void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
+
   void GetClientSize(int *width, int *height) const;
+  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
 
   void GetSize(int *width, int *height) const ;
+  wxSize GetSize() const { return wxWindow::GetSize(); }
+
   void GetPosition(int *x, int *y) const ;
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void ClientToScreen(int *x, int *y) const;
-  void ScreenToClient(int *x, int *y) const;
+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
+
+  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+
+  virtual void ClientToScreen(int *x, int *y) const;
+
+  virtual void ScreenToClient(int *x, int *y) const;
 
   virtual bool OnClose(void);
 
@@ -92,7 +103,7 @@ public:
 
   // Create status line
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-    const wxString& name = "statusBar");
+    const wxString& name = wxStatusLineNameStr);
   inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
   inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
   virtual void PositionStatusBar(void);
@@ -100,7 +111,9 @@ public:
     const wxString& name);
 
   // Create toolbar
-  virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
+  virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
+                                   wxWindowID id = -1,
+                                   const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
   // If made known to the frame, the frame will manage it automatically.
   virtual inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
@@ -126,6 +139,9 @@ public:
 
   virtual bool IsIconized(void) const ;
 
+  // Is it maximized?
+  virtual bool IsMaximized(void) const ;
+
   // Compatibility
   inline bool Iconized(void) const { return IsIconized(); }