X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9928e9d1ab76fd26557e2cf8e6715402639e999..2679196c7e7e919d4a15bec7d931a054e62c413f:/include/wx/msw/frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index d7faa10481..17fae5715a 100644
--- 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,
-                                     wxWindowID id = -1,
+                                     wxWindowID id = wxID_ANY,
                                      const wxString& name = wxToolBarNameStr);
 
     virtual void PositionToolBar();
@@ -102,6 +102,8 @@ public:
     // current size - this has an effect of refreshing the window layout
     virtual void SendSizeEvent();
 
+    virtual wxPoint GetClientAreaOrigin() const;
+
 protected:
     // common part of all ctors
     void Init();
@@ -109,7 +111,6 @@ protected:
     // override base class virtuals
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
-	virtual wxPoint GetClientAreaOrigin() const;
 
 #if wxUSE_MENUS_NATIVE
     // perform MSW-specific action when menubar is changed
@@ -132,7 +133,7 @@ protected:
     // 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;