X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42e69d6b435a4dd5415caf3750db62cf45b6f373..222594ead7a8ed85cb0c709850b2eed07fc3ac86:/include/wx/msw/frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 36458bf83a..0a328f9440 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -57,9 +57,6 @@ public:
 
     virtual bool Destroy();
 
-    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);
@@ -68,20 +65,25 @@ public:
 
     bool Show(bool show);
 
+    void DetachMenuBar();
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     virtual wxMenuBar *GetMenuBar() const;
 
     // Call this to simulate a menu command
-    bool Command(int id) { ProcessCommand(id); }
+    bool Command(int id) { return ProcessCommand(id); }
 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);
 
+    // make the window modal (all other windows unresponsive)
+    virtual void MakeModal(bool modal = TRUE);
+
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
 
     // Toolbar
+#if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
@@ -92,7 +94,9 @@ public:
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
 
     virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
 
+#if wxUSE_STATUSBAR
     // Status bar
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
@@ -118,6 +122,7 @@ public:
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
     static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
+#endif // wxUSE_STATUSBAR
 
     // Iconize
     virtual void Iconize(bool iconize);
@@ -130,6 +135,8 @@ public:
     // Compatibility
     bool Iconized() const { return IsIconized(); }
 
+    virtual bool IsTopLevel() const { return TRUE; }
+    
     virtual void Maximize(bool maximize);
     //  virtual bool LoadAccelerators(const wxString& table);
 
@@ -153,8 +160,8 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 
-    bool MSWCreate(int id, wxWindow *parent, const char *wclass,
-                   wxWindow *wx_win, const char *title,
+    bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass,
+                   wxWindow *wx_win, const wxChar *title,
                    int x, int y, int width, int height, long style);
 
   // tooltip management
@@ -169,11 +176,11 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetPosition(int *x, int *y) const;
 
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
+    virtual void DoClientToScreen(int *x, int *y) const;
+    virtual void DoScreenToClient(int *x, int *y) const;
+
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();
@@ -188,13 +195,19 @@ protected:
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     wxMenuBar *           m_frameMenuBar;
-    wxStatusBar *         m_frameStatusBar;
     wxIcon                m_icon;
     bool                  m_iconized;
     WXHICON               m_defaultIcon;
-    wxToolBar *           m_frameToolBar;
+
+#if wxUSE_STATUSBAR
+    wxStatusBar *         m_frameStatusBar;
 
     static bool           m_useNativeStatusBar;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    wxToolBar *           m_frameToolBar;
+#endif // wxUSE_TOOLBAR
 
 private:
 #if wxUSE_TOOLTIPS