changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index ed28cd8448a5c410194e3ae6f77559a4ccc38afb..a0e3ae67fcb2ce68a5d9be6fe12f36a79daad8b3 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -60,8 +60,12 @@ public:
     void GetSize(int *width, int *height) const ;
     void GetPosition(int *x, int *y) const ;
 
     void GetSize(int *width, int *height) const ;
     void GetPosition(int *x, int *y) const ;
 

-    virtual void ClientToScreen(int *x, int *y) const;
+    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 ScreenToClient(int *x, int *y) const;
 
     void OnSize(wxSizeEvent& event);
     virtual void ScreenToClient(int *x, int *y) const;
 
     void OnSize(wxSizeEvent& event);