added wxRectFromRECT()

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index b858afcd54765bb10daffb4ace426c5817218e24..7decd43e5c82708b5ace52b90be2cad9a8022a04 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -57,7 +57,7 @@ public:
     // Toolbar
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,
     // Toolbar
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,

-                                     wxWindowID id = -1,
+                                     wxWindowID id = wxID_ANY,

                                      const wxString& name = wxToolBarNameStr);
 
     virtual void PositionToolBar();
                                      const wxString& name = wxToolBarNameStr);
 
     virtual void PositionToolBar();


@@ -103,7 +103,7 @@ public:
     virtual void SendSizeEvent();
 
     virtual wxPoint GetClientAreaOrigin() const;
     virtual void SendSizeEvent();
 
     virtual wxPoint GetClientAreaOrigin() const;

-    
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -133,7 +133,7 @@ protected:
     // handle WM_INITMENUPOPUP message
     bool HandleInitMenuPopup(WXHMENU hMenu);
 
     // handle WM_INITMENUPOPUP message
     bool HandleInitMenuPopup(WXHMENU hMenu);
 

-    virtual bool IsMDIChild() const { return FALSE; }
+    virtual bool IsMDIChild() const { return false; }

 
     // get default (wxWidgets) icon for the frame
     virtual WXHICON GetDefaultIcon() const;
 
     // get default (wxWidgets) icon for the frame
     virtual WXHICON GetDefaultIcon() const;


@@ -142,11 +142,6 @@ protected:
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 

-    // Data to save/restore when calling ShowFullScreen
-    int                   m_fsStatusBarFields; // 0 for no status bar
-    int                   m_fsStatusBarHeight;
-    int                   m_fsToolBarHeight;
-

 private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;