X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92f1a59c288e0e181d2998a93220a73b89f675df..a0d9c6cb9112174b71970686a95b628819797b87:/include/wx/msw/frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index b90e37d8b0..17fae5715a 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "frame.h"
 #endif
 
@@ -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,11 +102,7 @@ public:
     // current size - this has an effect of refreshing the window layout
     virtual void SendSizeEvent();
 
-#ifdef __WXWINCE__
-    WXHWND GetCommandBar() { return m_commandBar; }
-    WXHWND CreateCommandBar() ;
-    void RemoveCommandBar() ;
-#endif
+    virtual wxPoint GetClientAreaOrigin() const;
 
 protected:
     // common part of all ctors
@@ -132,14 +128,14 @@ protected:
     bool MSWTranslateMessage(WXMSG* pMsg);
 
     // window proc for the frames
-    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // handle WM_INITMENUPOPUP message
     bool HandleInitMenuPopup(WXHMENU hMenu);
 
-    virtual bool IsMDIChild() const { return FALSE; }
+    virtual bool IsMDIChild() const { return false; }
 
-    // get default (wxWindows) icon for the frame
+    // get default (wxWidgets) icon for the frame
     virtual WXHICON GetDefaultIcon() const;
 
 #if wxUSE_STATUSBAR
@@ -155,15 +151,12 @@ private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
-#ifdef __WXWINCE__
-    WXHWND                m_commandBar;
-#endif
 
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame)
 };
 
 #endif