X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e306597309a120f2ae91385c731a5cb2722c52aa..4875458c3e56c10f92e6ba9d85bea68435386beb:/include/wx/msw/frame.h?ds=sidebyside

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 9e976c896a..51fe39e5ae 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
@@ -43,9 +43,9 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
-    
+
     ~wxFrame();
-    
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -53,52 +53,46 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
-    
+
     virtual bool Destroy();
-    
-    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 ;
+
+    wxSize GetSize() const { return wxWindow::GetSize(); }
     wxPoint GetPosition() const { return wxWindow::GetPosition(); }
-    
-    virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    
+    wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
+    wxRect GetClientRect() const { return wxWindow::GetClientRect(); }
+
     virtual void ClientToScreen(int *x, int *y) const;
-    
     virtual void ScreenToClient(int *x, int *y) const;
-    
+
     void OnSize(wxSizeEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnIdle(wxIdleEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
-    
+
     bool Show(bool show);
-    
+
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     virtual wxMenuBar *GetMenuBar() const ;
-    
+
     // Set title
     void SetTitle(const wxString& title);
     wxString GetTitle() const ;
-    
+
     void Centre(int direction = wxBOTH);
-    
+
     // Call this to simulate a menu command
     virtual void Command(int id);
     virtual void ProcessCommand(int id);
-    
+
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
-    
+
     // Toolbar
     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,
@@ -110,7 +104,7 @@ public:
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
 
     virtual void PositionToolBar();
-    
+
     // Status bar
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
@@ -125,48 +119,48 @@ public:
                                            long style,
                                            wxWindowID id,
                                            const wxString& name);
-    
+
     // Set status line text
     virtual void SetStatusText(const wxString& text, int number = 0);
-    
+
     // Set status line widths
     virtual void SetStatusWidths(int n, const int widths_field[]);
-    
+
     // Hint to tell framework which status bar to use
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
     static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
-    
+
     // Fit frame around subwindows
     virtual void Fit();
-    
+
     // Iconize
     virtual void Iconize(bool iconize);
-    
+
     virtual bool IsIconized() const ;
-    
+
     // Is it maximized?
     virtual bool IsMaximized() const ;
-    
+
     // Compatibility
     bool Iconized() const { return IsIconized(); }
-    
+
     virtual void Maximize(bool maximize);
     //  virtual bool LoadAccelerators(const wxString& table);
-    
+
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
-    
+
     // Query app for menu item updates (called from OnIdle)
     void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu);
-    
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+
     WXHMENU GetWinMenu() const ;
-    
+
     // Returns the origin of client area (may be different from (0,0) if the
     // frame has a toolbar)
     virtual wxPoint GetClientAreaOrigin() const;
-    
+
     // Implementation only from here
         // event handlers
     bool MSWOnPaint();
@@ -181,16 +175,16 @@ public:
                    wxWindow *wx_win, const char *title,
                    int x, int y, int width, int height, long style);
 
-        // tooltip management
+  // tooltip management
 #if wxUSE_TOOLTIPS
-    WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
+  WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
+  void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
 protected:
     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);
-    
+
     wxMenuBar *           m_frameMenuBar;
     wxStatusBar *         m_frameStatusBar;
     wxIcon                m_icon;
@@ -204,6 +198,11 @@ protected:
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
+
 private:
     DECLARE_EVENT_TABLE()
 };