X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56bd6aaca9d758663e202816e1861ee8674526e7..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/msw/tbar95.cpp?ds=sidebyside diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index b5fd2edad7..2f534d533d 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -214,6 +214,9 @@ bool wxToolBar::Create(wxWindow *parent, if (style & wxBORDER) msflags |= WS_BORDER; + if ( style & wxCLIP_SIBLINGS ) + msflags |= WS_CLIPSIBLINGS; + #ifdef TBSTYLE_TOOLTIPS msflags |= TBSTYLE_TOOLTIPS; #endif @@ -717,7 +720,7 @@ bool wxToolBar::Realize() // message handlers // ---------------------------------------------------------------------------- -bool wxToolBar::MSWCommand(WXUINT cmd, WXWORD id) +bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id) { wxToolBarToolBase *tool = FindById((int)id); if ( !tool ) @@ -747,7 +750,7 @@ bool wxToolBar::MSWCommand(WXUINT cmd, WXWORD id) bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, - WXLPARAM *result) + WXLPARAM *WXUNUSED(result)) { // First check if this applies to us NMHDR *hdr = (NMHDR *)lParam; @@ -912,7 +915,7 @@ void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle) (WPARAM)tool->GetId(), (LPARAM)MAKELONG(toggle, 0)); } -void wxToolBar::DoSetToggle(wxToolBarToolBase *tool, bool toggle) +void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle)) { // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or // without, so we really need to delete the button and recreate it here @@ -1155,3 +1158,4 @@ m_hBitmap = (WXHBITMAP) newBitmap; #endif // wxUSE_TOOLBAR && Win95 +