SOCKLEN_T expanded to socklen_t if supported, neede by ALPHA (yes, it's back!)

[wxWidgets.git] / include / wx / msw / frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 5f3870950debe302ea40eca24d35983885d6c10d..51fe39e5ae93d0819d33c6b7976c7aff3ae71799 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -56,22 +56,16 @@ public:
 
     virtual bool Destroy();
 
 
     virtual bool Destroy();
 

-    void SetClientSize(int width, int height);
-    void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
-

     void GetClientSize(int *width, int *height) const;
     void GetClientSize(int *width, int *height) const;

-    wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
-

     void GetSize(int *width, int *height) const ;
     void GetSize(int *width, int *height) const ;

-    wxSize GetSize() const { return wxWindow::GetSize(); }
-

     void GetPosition(int *x, int *y) const ;
     void GetPosition(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);
+    wxSize GetSize() const { return wxWindow::GetSize(); }
+    wxPoint GetPosition() const { return wxWindow::GetPosition(); }
+    wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
+    wxRect GetClientRect() const { return wxWindow::GetClientRect(); }

 
     virtual void ClientToScreen(int *x, int *y) const;
 
     virtual void ClientToScreen(int *x, int *y) const;

-

     virtual void ScreenToClient(int *x, int *y) const;
 
     void OnSize(wxSizeEvent& event);
     virtual void ScreenToClient(int *x, int *y) const;
 
     void OnSize(wxSizeEvent& event);


@@ -159,7 +153,7 @@ public:
 
     // Query app for menu item updates (called from OnIdle)
     void DoMenuUpdates();
 
     // Query app for menu item updates (called from OnIdle)
     void DoMenuUpdates();

-    void DoMenuUpdates(wxMenu* menu);
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);

 
     WXHMENU GetWinMenu() const ;
 
 
     WXHMENU GetWinMenu() const ;
 


@@ -204,6 +198,11 @@ protected:
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
     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()
 };
 private:
     DECLARE_EVENT_TABLE()
 };