Uses wxUSE_WCHAR_T for compilers that don't support wchar_t.

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 5f3870950debe302ea40eca24d35983885d6c10d..ff90eba4ce8782d32f29dc372c2b075f43398fa0 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -20,9 +20,9 @@
 #include "wx/toolbar.h"
 #include "wx/msw/accel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
@@ -56,22 +56,16 @@ public:
 
     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 ;
-    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 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();
-    void DoMenuUpdates(wxMenu* menu);
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
 
     WXHMENU GetWinMenu() const ;
 
@@ -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()
 };