X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a8158088fc2097457c3c6d7984c9e40e7eb3038..9390a202a8b9d67d393faf3e1323885e6a27c127:/include/wx/msw/frame.h?ds=sidebyside

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 28f1464835..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;
@@ -67,16 +68,11 @@ public:
   void GetPosition(int *x, int *y) const ;
   wxPoint GetPosition() const { return wxWindow::GetPosition(); }
 
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-    { wxWindow::SetSize(rect, sizeFlags); }
-  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 
-  void ClientToScreen(int *x, int *y) const;
-  wxPoint ClientToScreen(const wxPoint& pt) const { return wxWindow::ClientToScreen(pt); }
+  virtual void ClientToScreen(int *x, int *y) const;
 
-  void ScreenToClient(int *x, int *y) const;
-  wxPoint ScreenToClient(const wxPoint& pt) const { return wxWindow::ScreenToClient(pt); }
+  virtual void ScreenToClient(int *x, int *y) const;
 
   virtual bool OnClose(void);
 
@@ -107,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);
@@ -143,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(); }