Update to Scintilla 1.53

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 4b4b657d2f01ad6d01eeadf9e00b965af27b7719..b90e37d8b0e18c9f599f6f15174790022c146ae3 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
@@ -56,7 +56,7 @@ public:
 
     // Toolbar
 #if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
+    virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 
@@ -100,7 +100,13 @@ public:
 
     // a MSW only function which sends a size event to the window using its
     // current size - this has an effect of refreshing the window layout
-    void SendSizeEvent();
+    virtual void SendSizeEvent();
+
+#ifdef __WXWINCE__
+    WXHWND GetCommandBar() { return m_commandBar; }
+    WXHWND CreateCommandBar() ;
+    void RemoveCommandBar() ;
+#endif
 
 protected:
     // common part of all ctors
@@ -128,6 +134,9 @@ protected:
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
+    // handle WM_INITMENUPOPUP message
+    bool HandleInitMenuPopup(WXHMENU hMenu);
+
     virtual bool IsMDIChild() const { return FALSE; }
 
     // get default (wxWindows) icon for the frame
@@ -146,6 +155,9 @@ private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
+#ifdef __WXWINCE__
+    WXHWND                m_commandBar;
+#endif
 
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;