X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..b92203a8be20debe7615492c26969d17bcd7fa8d:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index f559b18ee2..cc8bd90b35 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/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); @@ -128,8 +128,8 @@ protected: // window proc for the frames long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - // handle WM_INITMENU message - bool HandleInitMenu(); + // handle WM_INITMENUPOPUP message + bool HandleInitMenuPopup(WXHMENU hMenu); virtual bool IsMDIChild() const { return FALSE; }