Put OnIdle() back. Without deleting pending objects, frames that have

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 369f3a3f5663a9d68fdcc1cf46577bb8f70434cf..b90e37d8b0e18c9f599f6f15174790022c146ae3 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -56,7 +56,7 @@ public:
 
     // Toolbar
 #if wxUSE_TOOLBAR
 
     // 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);
 
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 


@@ -102,6 +102,12 @@ public:
     // current size - this has an effect of refreshing the window layout
     virtual void SendSizeEvent();
 
     // 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
+

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


@@ -128,6 +134,9 @@ protected:
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // 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
     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
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips

+#ifdef __WXWINCE__
+    WXHWND                m_commandBar;
+#endif

 
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;
 
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;