X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/684c68fd7e1d6d118361d248b553cb4472924b44..7848088476db284a94f19eeb24411b45d676ac46:/src/msw/tbar95.cpp?ds=sidebyside diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 3b65427023..ab987ad5a3 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "tbar95.h" #endif @@ -36,42 +36,21 @@ #include "wx/settings.h" #include "wx/bitmap.h" #include "wx/dcmemory.h" + #include "wx/control.h" #endif -#if wxUSE_TOOLBAR && defined(__WIN95__) && wxUSE_TOOLBAR_NATIVE +#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI)) #include "wx/toolbar.h" - -#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) - #include "malloc.h" -#endif +#include "wx/sysopt.h" #include "wx/msw/private.h" -#ifndef __TWIN32__ - -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) - #include -#else - #include "wx/msw/gnuwin32/extra.h" -#endif +// include "properly" +#include "wx/msw/wrapcctl.h" -#endif // __TWIN32__ - -#include "wx/msw/dib.h" #include "wx/app.h" // for GetComCtl32Version -#if defined(__MWERKS__) && defined(__WXMSW__) -// including for max definition doesn't seem -// to work using CodeWarrior 6 Windows. So we define it -// here. (Otherwise we get a undefined identifier 'max' -// later on in this file.) (Added by dimitri@shortcut.nl) -# ifndef max -# define max(a,b) (((a) > (b)) ? (a) : (b)) -# endif - -#endif - // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -94,9 +73,15 @@ #ifndef TBSTYLE_FLAT #define TBSTYLE_LIST 0x1000 #define TBSTYLE_FLAT 0x0800 +#endif + +#ifndef TBSTYLE_TRANSPARENT #define TBSTYLE_TRANSPARENT 0x8000 #endif - // use TBSTYLE_TRANSPARENT if you use TBSTYLE_FLAT + +#ifndef TBSTYLE_TOOLTIPS + #define TBSTYLE_TOOLTIPS 0x0100 +#endif // Messages #ifndef TB_GETSTYLE @@ -119,7 +104,26 @@ // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) + +/* + TOOLBAR PROPERTIES + tool + bitmap + bitmap2 + tooltip + longhelp + radio (bool) + toggle (bool) + separator + style ( wxNO_BORDER | wxTB_HORIZONTAL) + bitmapsize + margins + packing + separation + + dontattachtoframe +*/ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent) @@ -135,14 +139,15 @@ class wxToolBarTool : public wxToolBarToolBase public: wxToolBarTool(wxToolBar *tbar, int id, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - bool toggle, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString) - : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle, - clientData, shortHelpString, longHelpString) + const wxString& shortHelp, + const wxString& longHelp) + : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind, + clientData, shortHelp, longHelp) { m_nSepCount = 0; } @@ -153,6 +158,19 @@ public: m_nSepCount = 1; } + virtual void SetLabel(const wxString& label) + { + if ( label == m_label ) + return; + + wxToolBarToolBase::SetLabel(label); + + // we need to update the label shown in the toolbar because it has a + // pointer to the internal buffer of the old label + // + // TODO: use TB_SETBUTTONINFO + } + // set/get the number of separators which we use to cover the space used by // a control in the toolbar void SetSeparatorsCount(size_t count) { m_nSepCount = count; } @@ -160,6 +178,8 @@ public: private: size_t m_nSepCount; + + DECLARE_NO_COPY_CLASS(wxToolBarTool) }; @@ -172,15 +192,16 @@ private: // ---------------------------------------------------------------------------- wxToolBarToolBase *wxToolBar::CreateTool(int id, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - bool toggle, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString) + const wxString& shortHelp, + const wxString& longHelp) { - return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle, - clientData, shortHelpString, longHelpString); + return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind, + clientData, shortHelp, longHelp); } wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) @@ -211,62 +232,80 @@ bool wxToolBar::Create(wxWindow *parent, long style, const wxString& name) { - // toolbars never have border, giving one to them results in broken - // appearance - style &= ~wxBORDER_MASK; - style |= wxBORDER_NONE; - // common initialisation if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; - // prepare flags - DWORD msflags = 0; // WS_VISIBLE | WS_CHILD always included + // MSW-specific initialisation + if ( !MSWCreateToolbar(pos, size) ) + return FALSE; - if ( style & wxCLIP_SIBLINGS ) - msflags |= WS_CLIPSIBLINGS; + wxSetCCUnicodeFormat(GetHwnd()); -#ifdef TBSTYLE_TOOLTIPS - msflags |= TBSTYLE_TOOLTIPS; -#endif + // set up the colors and fonts + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR)); + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - if (style & wxTB_FLAT) - { - if (wxTheApp->GetComCtl32Version() > 400) - msflags |= TBSTYLE_FLAT; - } + return TRUE; +} - // MSW-specific initialisation - if ( !wxControl::MSWCreateControl(TOOLBARCLASSNAME, msflags) ) +bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size) +{ + if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) ) return FALSE; // toolbar-specific post initialisation ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - // set up the colors and fonts - wxRGBToColour(m_backgroundColour, GetSysColor(COLOR_BTNFACE)); - m_foregroundColour = *wxBLACK; + return TRUE; +} - SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); +void wxToolBar::Recreate() +{ + const HWND hwndOld = GetHwnd(); + if ( !hwndOld ) + { + // we haven't been created yet, no need to recreate + return; + } - // position it - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + // get the position and size before unsubclassing the old toolbar + const wxPoint pos = GetPosition(); + const wxSize size = GetSize(); - if (width <= 0) - width = 100; - if (height <= 0) - height = m_defaultHeight; - if (x < 0) - x = 0; - if (y < 0) - y = 0; + UnsubclassWin(); - SetSize(x, y, width, height); + if ( !MSWCreateToolbar(pos, size) ) + { + // what can we do? + wxFAIL_MSG( _T("recreating the toolbar failed") ); - return TRUE; + return; + } + + // reparent all our children under the new toolbar + for ( wxWindowList::compatibility_iterator node = m_children.GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *win = node->GetData(); + if ( !win->IsTopLevel() ) + ::SetParent(GetHwndOf(win), GetHwnd()); + } + + // only destroy the old toolbar now -- after all the children had been + // reparented + ::DestroyWindow(hwndOld); + + // it is for the old bitmap control and can't be used with the new one + if ( m_hBitmap ) + { + ::DeleteObject((HBITMAP) m_hBitmap); + m_hBitmap = 0; + } + + Realize(); + UpdateSize(); } wxToolBar::~wxToolBar() @@ -285,12 +324,65 @@ wxToolBar::~wxToolBar() } } +wxSize wxToolBar::DoGetBestSize() const +{ + wxSize sizeBest = GetToolSize(); + sizeBest.x *= GetToolsCount(); + + // reverse horz and vertical components if necessary + return HasFlag(wxTB_VERTICAL) ? wxSize(sizeBest.y, sizeBest.x) : sizeBest; +} + +WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + // toolbars never have border, giving one to them results in broken + // appearance + WXDWORD msStyle = wxControl::MSWGetStyle + ( + (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle + ); + + // always include this one, it never hurts and setting it later only if we + // do have tooltips wouldn't work + msStyle |= TBSTYLE_TOOLTIPS; + + if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) ) + { + // static as it doesn't change during the program lifetime + static int s_verComCtl = wxTheApp->GetComCtl32Version(); + + // comctl32.dll 4.00 doesn't support the flat toolbars and using this + // style with 6.00 (part of Windows XP) leads to the toolbar with + // incorrect background colour - and not using it still results in the + // correct (flat) toolbar, so don't use it there + if ( s_verComCtl > 400 && s_verComCtl < 600 ) + { + msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT; + } + + if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT ) + { + msStyle |= TBSTYLE_LIST; + } + } + + if ( style & wxTB_NODIVIDER ) + msStyle |= CCS_NODIVIDER; + + if ( style & wxTB_NOALIGN ) + msStyle |= CCS_NOPARENTALIGN; + + if ( style & wxTB_VERTICAL ) + msStyle |= CCS_VERT; + + return msStyle; +} + // ---------------------------------------------------------------------------- // adding/removing tools // ---------------------------------------------------------------------------- -bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), - wxToolBarToolBase *tool) +bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) { // nothing special to do here - we really create the toolbar buttons in // Realize() later @@ -308,7 +400,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool) // first determine the position of the first button to delete: it may be // different from pos if we use several separators to cover the space used // by a control - wxToolBarToolsList::Node *node; + wxToolBarToolsList::compatibility_iterator node; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { wxToolBarToolBase *tool2 = node->GetData(); @@ -378,172 +470,206 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool) bool wxToolBar::Realize() { - size_t nTools = GetToolsCount(); + const size_t nTools = GetToolsCount(); if ( nTools == 0 ) { // nothing to do return TRUE; } - bool isVertical = (GetWindowStyle() & wxTB_VERTICAL) != 0; + const bool isVertical = HasFlag(wxTB_VERTICAL); + + // delete all old buttons, if any + for ( size_t pos = 0; pos < m_nButtons; pos++ ) + { + if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) ) + { + wxLogDebug(wxT("TB_DELETEBUTTON failed")); + } + } // First, add the bitmap: we use one bitmap for all toolbar buttons // ---------------------------------------------------------------- - // if we already have a bitmap, we'll replace the existing one - otherwise - // we'll install a new one - HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap; + wxToolBarToolsList::compatibility_iterator node; + int bitmapId = 0; + + wxSize sizeBmp; + if ( HasFlag(wxTB_NOICONS) ) + { + // no icons, don't leave space for them + sizeBmp.x = + sizeBmp.y = 0; + } + else // do show icons + { + // if we already have a bitmap, we'll replace the existing one -- + // otherwise we'll install a new one + HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap; + + sizeBmp.x = m_defaultWidth; + sizeBmp.y = m_defaultHeight; - int totalBitmapWidth = (int)(m_defaultWidth * nTools); - int totalBitmapHeight = (int)m_defaultHeight; + const wxCoord totalBitmapWidth = m_defaultWidth * nTools, + totalBitmapHeight = m_defaultHeight; - // Create a bitmap and copy all the tool bitmaps to it + // Create a bitmap and copy all the tool bitmaps to it #if USE_BITMAP_MASKS - wxMemoryDC dcAllButtons; - wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight); - dcAllButtons.SelectObject(bitmap); - dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH); - dcAllButtons.Clear(); - - m_hBitmap = bitmap.GetHBITMAP(); - HBITMAP hBitmap = (HBITMAP)m_hBitmap; + wxMemoryDC dcAllButtons; + wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight); + dcAllButtons.SelectObject(bitmap); + dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH); + dcAllButtons.Clear(); + + m_hBitmap = bitmap.GetHBITMAP(); + HBITMAP hBitmap = (HBITMAP)m_hBitmap; #else // !USE_BITMAP_MASKS - HBITMAP hBitmap = ::CreateCompatibleBitmap(ScreenHDC(), - totalBitmapWidth, - totalBitmapHeight); - if ( !hBitmap ) - { - wxLogLastError(_T("CreateCompatibleBitmap")); + HBITMAP hBitmap = ::CreateCompatibleBitmap(ScreenHDC(), + totalBitmapWidth, + totalBitmapHeight); + if ( !hBitmap ) + { + wxLogLastError(_T("CreateCompatibleBitmap")); - return FALSE; - } + return FALSE; + } - m_hBitmap = (WXHBITMAP)hBitmap; + m_hBitmap = (WXHBITMAP)hBitmap; - HDC memoryDC = ::CreateCompatibleDC(NULL); - HBITMAP oldBitmap = (HBITMAP) ::SelectObject(memoryDC, hBitmap); + MemoryHDC memoryDC; + SelectInHDC hdcSelector(memoryDC, hBitmap); - HDC memoryDC2 = ::CreateCompatibleDC(NULL); + MemoryHDC memoryDC2; #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS - // the button position - wxCoord x = 0; + if (wxSystemOptions::HasOption(wxT("msw.remap")) && wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 0) + { +#if USE_BITMAP_MASKS + dcAllButtons.SelectObject(wxNullBitmap); +#endif - // the number of buttons (not separators) - int nButtons = 0; + // Even if we're not remapping the bitmap + // content, we still have to remap the background. + hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap, + totalBitmapWidth, totalBitmapHeight); - wxToolBarToolsList::Node *node = m_tools.GetFirst(); - while ( node ) - { - wxToolBarToolBase *tool = node->GetData(); - if ( tool->IsButton() ) +#if USE_BITMAP_MASKS + dcAllButtons.SelectObject(bitmap); +#endif + } + + // the button position + wxCoord x = 0; + + // the number of buttons (not separators) + int nButtons = 0; + + for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { - const wxBitmap& bmp = tool->GetBitmap1(); - if ( bmp.Ok() ) + wxToolBarToolBase *tool = node->GetData(); + if ( tool->IsButton() ) { + const wxBitmap& bmp = tool->GetNormalBitmap(); + if ( bmp.Ok() ) + { + int xOffset = wxMax(0, (m_defaultWidth - bmp.GetWidth())/2); + int yOffset = wxMax(0, (m_defaultHeight - bmp.GetHeight())/2); #if USE_BITMAP_MASKS - // notice the last parameter: do use mask - dcAllButtons.DrawBitmap(tool->GetBitmap1(), x, 0, TRUE); + // notice the last parameter: do use mask + dcAllButtons.DrawBitmap(bmp, x+xOffset, yOffset, TRUE); #else // !USE_BITMAP_MASKS - HBITMAP hbmp = GetHbitmapOf(bmp); - HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp); - if ( !BitBlt(memoryDC, x, 0, m_defaultWidth, m_defaultHeight, - memoryDC2, 0, 0, SRCCOPY) ) + SelectInHDC hdcSelector2(memoryDC2, GetHbitmapOf(bmp)); + if ( !BitBlt(memoryDC, + x+xOffset, yOffset, m_defaultWidth, m_defaultHeight, + memoryDC2, + 0, 0, SRCCOPY) ) + { + wxLogLastError(wxT("BitBlt")); + } +#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS + } + else { - wxLogLastError(wxT("BitBlt")); + wxFAIL_MSG( _T("invalid tool button bitmap") ); } - ::SelectObject(memoryDC2, oldBitmap2); -#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS - } - else - { - wxFAIL_MSG( _T("invalid tool button bitmap") ); + // still inc width and number of buttons because otherwise the + // subsequent buttons will all be shifted which is rather confusing + // (and like this you'd see immediately which bitmap was bad) + x += m_defaultWidth; + nButtons++; } - - // still inc width and number of buttons because otherwise the - // subsequent buttons will all be shifted which is rather confusing - // (and like this you'd see immediately which bitmap was bad) - x += m_defaultWidth; - nButtons++; } - node = node->GetNext(); - } - #if USE_BITMAP_MASKS - dcAllButtons.SelectObject(wxNullBitmap); + dcAllButtons.SelectObject(wxNullBitmap); - // don't delete this HBITMAP! - bitmap.SetHBITMAP(0); -#else // !USE_BITMAP_MASKS - ::SelectObject(memoryDC, oldBitmap); - ::DeleteDC(memoryDC); - ::DeleteDC(memoryDC2); + // don't delete this HBITMAP! + bitmap.SetHBITMAP(0); #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS - // Map to system colours - hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap, - totalBitmapWidth, totalBitmapHeight); - - int bitmapId = 0; + if (!wxSystemOptions::HasOption(wxT("msw.remap")) || wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 1) + { + // Map to system colours + hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap, + totalBitmapWidth, totalBitmapHeight); + } - bool addBitmap = TRUE; + bool addBitmap = TRUE; - if ( oldToolBarBitmap ) - { -#ifdef TB_REPLACEBITMAP - if ( wxTheApp->GetComCtl32Version() >= 400 ) + if ( oldToolBarBitmap ) { - TBREPLACEBITMAP replaceBitmap; - replaceBitmap.hInstOld = NULL; - replaceBitmap.hInstNew = NULL; - replaceBitmap.nIDOld = (UINT) oldToolBarBitmap; - replaceBitmap.nIDNew = (UINT) hBitmap; - replaceBitmap.nButtons = nButtons; - if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP, - 0, (LPARAM) &replaceBitmap) ) +#ifdef TB_REPLACEBITMAP + if ( wxTheApp->GetComCtl32Version() >= 400 ) { - wxFAIL_MSG(wxT("Could not replace the old bitmap")); - } + TBREPLACEBITMAP replaceBitmap; + replaceBitmap.hInstOld = NULL; + replaceBitmap.hInstNew = NULL; + replaceBitmap.nIDOld = (UINT) oldToolBarBitmap; + replaceBitmap.nIDNew = (UINT) hBitmap; + replaceBitmap.nButtons = nButtons; + if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP, + 0, (LPARAM) &replaceBitmap) ) + { + wxFAIL_MSG(wxT("Could not replace the old bitmap")); + } - ::DeleteObject(oldToolBarBitmap); + ::DeleteObject(oldToolBarBitmap); - // already done - addBitmap = FALSE; - } - else + // already done + addBitmap = FALSE; + } + else #endif // TB_REPLACEBITMAP - { - // we can't replace the old bitmap, so we will add another one - // (awfully inefficient, but what else to do?) and shift the bitmap - // indices accordingly - addBitmap = TRUE; + { + // we can't replace the old bitmap, so we will add another one + // (awfully inefficient, but what else to do?) and shift the bitmap + // indices accordingly + addBitmap = TRUE; - bitmapId = m_nButtons; + bitmapId = m_nButtons; + } } - // Now delete all the buttons - for ( size_t pos = 0; pos < m_nButtons; pos++ ) + if ( addBitmap ) // no old bitmap or we can't replace it { - if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) ) + TBADDBITMAP addBitmap; + addBitmap.hInst = 0; + addBitmap.nID = (UINT) hBitmap; + if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP, + (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 ) { - wxLogDebug(wxT("TB_DELETEBUTTON failed")); + wxFAIL_MSG(wxT("Could not add bitmap to toolbar")); } } - } - if ( addBitmap ) // no old bitmap or we can't replace it + // don't call SetToolBitmapSize() as we don't want to change the values of + // m_defaultWidth/Height + if ( !::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, + MAKELONG(sizeBmp.x, sizeBmp.y)) ) { - TBADDBITMAP addBitmap; - addBitmap.hInst = 0; - addBitmap.nID = (UINT) hBitmap; - if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP, - (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 ) - { - wxFAIL_MSG(wxT("Could not add bitmap to toolbar")); - } + wxLogLastError(_T("TB_SETBITMAPSIZE")); } // Next add the buttons and separators @@ -554,19 +680,26 @@ bool wxToolBar::Realize() // this array will hold the indices of all controls in the toolbar wxArrayInt controlIds; + bool lastWasRadio = FALSE; int i = 0; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { wxToolBarToolBase *tool = node->GetData(); - // don't add separators to the vertical toolbar - looks ugly - if ( isVertical && tool->IsSeparator() ) + // don't add separators to the vertical toolbar with old comctl32.dll + // versions as they didn't handle this properly + if ( isVertical && tool->IsSeparator() && + wxTheApp->GetComCtl32Version() <= 472 ) + { continue; + } + TBBUTTON& button = buttons[i]; wxZeroMemory(button); + bool isRadio = FALSE; switch ( tool->GetStyle() ) { case wxTOOL_STYLE_CONTROL: @@ -579,7 +712,18 @@ bool wxToolBar::Realize() break; case wxTOOL_STYLE_BUTTON: - button.iBitmap = bitmapId; + if ( !HasFlag(wxTB_NOICONS) ) + button.iBitmap = bitmapId; + + if ( HasFlag(wxTB_TEXT) ) + { + const wxString& label = tool->GetLabel(); + if ( !label.empty() ) + { + button.iString = (int)label.c_str(); + } + } + button.idCommand = tool->GetId(); if ( tool->IsEnabled() ) @@ -587,18 +731,46 @@ bool wxToolBar::Realize() if ( tool->IsToggled() ) button.fsState |= TBSTATE_CHECKED; - button.fsStyle = tool->CanBeToggled() ? TBSTYLE_CHECK - : TBSTYLE_BUTTON; + switch ( tool->GetKind() ) + { + case wxITEM_RADIO: + button.fsStyle = TBSTYLE_CHECKGROUP; + + if ( !lastWasRadio ) + { + // the first item in the radio group is checked by + // default to be consistent with wxGTK and the menu + // radio items + button.fsState |= TBSTATE_CHECKED; + + tool->Toggle(TRUE); + } + + isRadio = TRUE; + break; + + case wxITEM_CHECK: + button.fsStyle = TBSTYLE_CHECK; + break; + + default: + wxFAIL_MSG( _T("unexpected toolbar button kind") ); + // fall through + + case wxITEM_NORMAL: + button.fsStyle = TBSTYLE_BUTTON; + } bitmapId++; break; } + lastWasRadio = isRadio; + i++; } - if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, - (WPARAM)i, (LPARAM)buttons) ) + if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)buttons) ) { wxLogLastError(wxT("TB_ADDBUTTONS")); } @@ -647,7 +819,7 @@ bool wxToolBar::Realize() int left = -1; // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+ -#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 ) +#ifdef TB_SETBUTTONINFO // available in headers, now check whether it is available now // (during run-time) if ( wxTheApp->GetComCtl32Version() >= 471 ) @@ -763,21 +935,28 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id) if ( !tool ) return FALSE; + bool toggled = false; // just to suppress warnings + if ( tool->CanBeToggled() ) { LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0); - tool->Toggle((state & TBSTATE_CHECKED) != 0); - } + toggled = (state & TBSTATE_CHECKED) != 0; - bool toggled = tool->IsToggled(); + // ignore the event when a radio button is released, as this doesn't seem to + // happen at all, and is handled otherwise + if ( tool->GetKind() == wxITEM_RADIO && !toggled ) + return TRUE; - // OnLeftClick() can veto the button state change - for buttons which may - // be toggled only, of couse + tool->Toggle(toggled); + UnToggleRadioGroup(tool); + } + + // OnLeftClick() can veto the button state change - for buttons which + // may be toggled only, of couse if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() ) { // revert back - toggled = !toggled; - tool->SetToggle(toggled); + tool->Toggle(!toggled); ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0)); } @@ -789,13 +968,14 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *WXUNUSED(result)) { +#if wxUSE_TOOLTIPS // First check if this applies to us NMHDR *hdr = (NMHDR *)lParam; // the tooltips control created by the toolbar is sometimes Unicode, even // in an ANSI application - this seems to be a bug in comctl32.dll v5 - int code = (int)hdr->code; - if ( (code != TTN_NEEDTEXTA) && (code != TTN_NEEDTEXTW) ) + UINT code = hdr->code; + if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) ) return FALSE; HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0); @@ -809,51 +989,10 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), if ( !tool ) return FALSE; - const wxString& help = tool->GetShortHelp(); - - if ( !help.IsEmpty() ) - { - if ( code == TTN_NEEDTEXTA ) - { - ttText->lpszText = (wxChar *)help.c_str(); - } - else - { -#if wxUSE_UNICODE - ttText->lpszText = (wxChar *)help.c_str(); + return HandleTooltipNotify(code, lParam, tool->GetShortHelp()); #else - // VZ: I don't know why it happens, but the versions of - // comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW - // even to ANSI programs (normally, this message is supposed - // to be sent to Unicode programs only) - hence we need to - // handle it as well, otherwise no tooltips will be shown in - // this case - - size_t lenAnsi = help.Len(); - #if defined( __MWERKS__ ) || defined( __CYGWIN__ ) - // MetroWerks doesn't like calling mbstowcs with NULL argument - // neither Cygwin does - size_t lenUnicode = 2*lenAnsi; - #else - size_t lenUnicode = mbstowcs(NULL, help, lenAnsi); - #endif - - // using the pointer of right type avoids us doing all sorts of - // pointer arithmetics ourselves - wchar_t *dst = (wchar_t *)ttText->szText, - *pwz = new wchar_t[lenUnicode + 1]; - mbstowcs(pwz, help, lenAnsi + 1); - memcpy(dst, pwz, lenUnicode*sizeof(wchar_t)); - - // put the terminating _wide_ NUL - dst[lenUnicode] = 0; - - delete [] pwz; + return FALSE; #endif - } - } - - return TRUE; } // ---------------------------------------------------------------------------- @@ -892,7 +1031,8 @@ wxSize wxToolBar::GetToolSize() const { // TB_GETBUTTONSIZE is supported from version 4.70 #if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \ - && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) + && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \ + && !defined (__DIGITALMARS__) if ( wxTheApp->GetComCtl32Version() >= 470 ) { DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0); @@ -911,7 +1051,7 @@ static wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools, size_t index ) { - wxToolBarToolsList::Node* current = tools.GetFirst(); + wxToolBarToolsList::compatibility_iterator current = tools.GetFirst(); for ( ; current != 0; current = current->GetNext() ) { @@ -970,6 +1110,32 @@ void wxToolBar::UpdateSize() } } +// ---------------------------------------------------------------------------- +// toolbar styles +// --------------------------------------------------------------------------- + +void wxToolBar::SetWindowStyleFlag(long style) +{ + // the style bits whose changes force us to recreate the toolbar + static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS; + + const long styleOld = GetWindowStyle(); + + wxToolBarBase::SetWindowStyleFlag(style); + + // don't recreate an empty toolbar: not only this is unnecessary, but it is + // also fatal as we'd then try to recreate the toolbar when it's just being + // created + if ( GetToolsCount() && + (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) ) + { + // to remove the text labels, simply re-realizing the toolbar is enough + // but I don't know of any way to add the text to an existing toolbar + // other than by recreating it entirely + Recreate(); + } +} + // ---------------------------------------------------------------------------- // tool state // ---------------------------------------------------------------------------- @@ -1018,6 +1184,13 @@ void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event) void wxToolBar::OnMouseEvent(wxMouseEvent& event) { + if (event.Leaving() && m_pInTool) + { + OnMouseEnter( -1 ); + event.Skip(); + return; + } + if (event.RightDown()) { // For now, we don't have an id. Later we could @@ -1030,148 +1203,202 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event) } } -long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam) { - if ( nMsg == WM_SIZE ) + // calculate our minor dimension ourselves - we're confusing the standard + // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks + RECT r; + if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) ) { - // calculate our minor dimenstion ourselves - we're confusing the - // standard logic (TB_AUTOSIZE) with our horizontal toolbars and other - // hacks - RECT r; - if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) ) - { - int w, h; + int w, h; - if ( GetWindowStyle() & wxTB_VERTICAL ) + if ( GetWindowStyle() & wxTB_VERTICAL ) + { + w = r.right - r.left; + if ( m_maxRows ) { - w = r.right - r.left; - if ( m_maxRows ) - { - w *= (m_nButtons + m_maxRows - 1)/m_maxRows; - } - h = HIWORD(lParam); + w *= (m_nButtons + m_maxRows - 1)/m_maxRows; } + h = HIWORD(lParam); + } + else + { + w = LOWORD(lParam); + if (HasFlag( wxTB_FLAT )) + h = r.bottom - r.top - 3; else - { - w = LOWORD(lParam); h = r.bottom - r.top; - if ( m_maxRows ) - { - h += 6; // FIXME: this is the separator line height... - h *= m_maxRows; - } - } - - if ( MAKELPARAM(w, h) != lParam ) + if ( m_maxRows ) { - // size really changed - SetSize(w, h); + // FIXME: hardcoded separator line height... + h += HasFlag(wxTB_NODIVIDER) ? 4 : 6; + h *= m_maxRows; } - - // message processed - return 0; - } - } - else if ( nMsg == WM_MOUSEMOVE ) - { - wxCoord x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); - wxToolBarToolBase* tool = FindToolForPosition( x, y ); - - // cursor left current tool - if( tool != m_pInTool && !tool ) - { - m_pInTool = 0; - OnMouseEnter( -1 ); } - // cursor entered a tool - if( tool != m_pInTool && tool ) + if ( MAKELPARAM(w, h) != lParam ) { - m_pInTool = tool; - OnMouseEnter( tool->GetId() ); + // size really changed + SetSize(w, h); } - // we don't handle mouse moves, so fall through - // to wxControl::MSWWindowProc + // message processed + return TRUE; } - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + return FALSE; } -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height) +bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam) { - // number of the colours we map: if you change this, update - // wxBITMAP_STD_COLOURS in the resources as well: it must have the same number - // of pixels - static const size_t NUM_OF_MAPPED_COLOURS = 4; + // erase any dummy separators which we used for aligning the controls if + // any here + + // first of all, do we have any controls at all? + wxToolBarToolsList::compatibility_iterator node; + for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) + { + if ( node->GetData()->IsControl() ) + break; + } + + if ( !node ) + { + // no controls, nothing to erase + return FALSE; + } - static bool s_coloursInit = FALSE; - static long s_stdColours[NUM_OF_MAPPED_COLOURS]; + // prepare the DC on which we'll be drawing + wxClientDC dc(this); + dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID)); + dc.SetPen(*wxTRANSPARENT_PEN); - if (!s_coloursInit) + RECT r; + if ( !GetUpdateRect(GetHwnd(), &r, FALSE) ) + { + // nothing to redraw anyhow + return FALSE; + } + + wxRect rectUpdate; + wxCopyRECTToRect(r, rectUpdate); + + dc.SetClippingRegion(rectUpdate); + + // draw the toolbar tools, separators &c normally + wxControl::MSWWindowProc(WM_PAINT, wParam, lParam); + + // for each control in the toolbar find all the separators intersecting it + // and erase them + // + // NB: this is really the only way to do it as we don't know if a separator + // corresponds to a control (i.e. is a dummy one) or a real one + // otherwise + for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { - // When a bitmap is loaded, the RGB values can change (apparently - // because Windows adjusts them to care for the old programs always - // using 0xc0c0c0 while the transparent colour for the new Windows - // versions is different). But we do this adjustment ourselves so we - // want to avoid Windows' "help" and for this we need to have a - // reference bitmap which can tell us what the RGB values change to. - wxBitmap stdColourBitmap(_T("wxBITMAP_STD_COLOURS")); - if (stdColourBitmap.Ok()) + wxToolBarToolBase *tool = node->GetData(); + if ( tool->IsControl() ) { - wxMemoryDC memDC; - memDC.SelectObject(stdColourBitmap); + // get the control rect in our client coords + wxControl *control = tool->GetControl(); + wxRect rectCtrl = control->GetRect(); - wxColour colour; - for ( size_t i = 0; i < WXSIZEOF(s_stdColours); i++ ) + // iterate over all buttons + TBBUTTON tbb; + int count = ::SendMessage(GetHwnd(), TB_BUTTONCOUNT, 0, 0); + for ( int n = 0; n < count; n++ ) { - memDC.GetPixel(i, 0, &colour); - s_stdColours[i] = wxColourToRGB(colour); + // is it a separator? + if ( !::SendMessage(GetHwnd(), TB_GETBUTTON, + n, (LPARAM)&tbb) ) + { + wxLogDebug(_T("TB_GETBUTTON failed?")); + + continue; + } + + if ( tbb.fsStyle != TBSTYLE_SEP ) + continue; + + // get the bounding rect of the separator + RECT r; + if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT, + n, (LPARAM)&r) ) + { + wxLogDebug(_T("TB_GETITEMRECT failed?")); + + continue; + } + + // does it intersect the control? + wxRect rectItem; + wxCopyRECTToRect(r, rectItem); + if ( rectCtrl.Intersects(rectItem) ) + { + // yes, do erase it! + dc.DrawRectangle(rectItem); + + // Necessary in case we use a no-paint-on-size + // style in the parent: the controls can disappear + control->Refresh(FALSE); + } } } - else - { - s_stdColours[0] = RGB(000,000,000) ; - s_stdColours[1] = RGB(128,128,128) ; - s_stdColours[2] = RGB(192,192,192) ; - s_stdColours[3] = RGB(255,255,255) ; - //s_stdColours[4] = RGB(000,000,255) ; - //s_stdColours[5] = RGB(255,000,255) ; - } + } + + return TRUE; +} + +void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam) +{ + wxCoord x = GET_X_LPARAM(lParam), + y = GET_Y_LPARAM(lParam); + wxToolBarToolBase* tool = FindToolForPosition( x, y ); + + // cursor left current tool + if( tool != m_pInTool && !tool ) + { + m_pInTool = 0; + OnMouseEnter( -1 ); + } - s_coloursInit = TRUE; + // cursor entered a tool + if( tool != m_pInTool && tool ) + { + m_pInTool = tool; + OnMouseEnter( tool->GetId() ); } +} - COLORMAP ColorMap[NUM_OF_MAPPED_COLOURS]; - - // black (0, 0 0) - ColorMap[0].from = s_stdColours[0]; - ColorMap[0].to = COLOR_BTNTEXT; - // dark grey (128, 128, 128) - ColorMap[1].from = s_stdColours[1]; - ColorMap[1].to = COLOR_BTNSHADOW; - // bright grey (192, 192, 192) - ColorMap[2].from = s_stdColours[2]; - ColorMap[2].to = COLOR_BTNFACE; - // white (255, 255, 255) - ColorMap[3].from = s_stdColours[3]; - ColorMap[3].to = COLOR_BTNHIGHLIGHT; - // blue (0, 0, 255) - // ColorMap[4].from = s_stdColours[4]; - // ColorMap[4].to = COLOR_HIGHLIGHT; - // magenta (255, 0, 255) - // ColorMap[4].from = s_stdColours[5]; - // ColorMap[4].to = COLOR_WINDOW; - - for ( size_t n = 0; n < WXSIZEOF(ColorMap); n++ ) +WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +{ + switch ( nMsg ) { - ColorMap[n].to = ::GetSysColor(ColorMap[n].to); + case WM_SIZE: + if ( HandleSize(wParam, lParam) ) + return 0; + break; + + case WM_MOUSEMOVE: + // we don't handle mouse moves, so always pass the message to + // wxControl::MSWWindowProc + HandleMouseMove(wParam, lParam); + break; + + case WM_PAINT: + if ( HandlePaint(wParam, lParam) ) + return 0; } + return wxControl::MSWWindowProc(nMsg, wParam, lParam); +} + +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + +WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height) +{ MemoryHDC hdcMem; if ( !hdcMem ) @@ -1190,20 +1417,22 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height) return bitmap; } + wxCOLORMAP *cmap = wxGetStdColourMap(); + for ( int i = 0; i < width; i++ ) { for ( int j = 0; j < height; j++ ) { COLORREF pixel = ::GetPixel(hdcMem, i, j); - for ( size_t k = 0; k < numColours; k++ ) + for ( size_t k = 0; k < wxSTD_COL_MAX; k++ ) { - COLORREF col = ColorMap[k].from; + COLORREF col = cmap[k].from; if ( abs(GetRValue(pixel) - GetRValue(col)) < 10 && abs(GetGValue(pixel) - GetGValue(col)) < 10 && abs(GetBValue(pixel) - GetBValue(col)) < 10 ) { - ::SetPixel(hdcMem, i, j, ColorMap[k].to); + ::SetPixel(hdcMem, i, j, cmap[k].to); break; } }