X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..e959aee256848b44a21cc9fe95570dab55c51658:/src/msw/tbar95.cpp diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 89e95ab321..5982c8b8b7 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tbar95.cpp +// Name: msw/tbar95.cpp // Purpose: wxToolBar95 // Author: Julian Smart // Modified by: @@ -9,73 +9,94 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "tbar95.h" + #pragma implementation "tbar95.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/log.h" + #include "wx/intl.h" + #include "wx/dynarray.h" + #include "wx/settings.h" + #include "wx/bitmap.h" #endif #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__) #if !defined(__GNUWIN32__) && !defined(__SALFORDC__) -#include "malloc.h" + #include "malloc.h" #endif -#include - -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) -#include -#endif +#include "wx/msw/private.h" #ifndef __TWIN32__ -#ifdef __GNUWIN32__ -#ifndef wxUSE_NORLANDER_HEADERS -#include "wx/msw/gnuwin32/extra.h" -#endif -#endif + +#ifdef __GNUWIN32_OLD__ + #include "wx/msw/gnuwin32/extra.h" +#else + #include #endif +#endif // __TWIN32__ + #include "wx/msw/dib.h" #include "wx/tbar95.h" -#include "wx/app.h" -#include "wx/msw/private.h" +#include "wx/app.h" // for GetComCtl32Version + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// these standard constants are not always defined in compilers headers // Styles #ifndef TBSTYLE_FLAT -#define TBSTYLE_LIST 0x1000 -#define TBSTYLE_FLAT 0x0800 -#define TBSTYLE_TRANSPARENT 0x8000 + #define TBSTYLE_LIST 0x1000 + #define TBSTYLE_FLAT 0x0800 + #define TBSTYLE_TRANSPARENT 0x8000 #endif // use TBSTYLE_TRANSPARENT if you use TBSTYLE_FLAT // Messages #ifndef TB_GETSTYLE -#define TB_GETSTYLE (WM_USER + 57) -#define TB_SETSTYLE (WM_USER + 56) + #define TB_GETSTYLE (WM_USER + 57) + #define TB_SETSTYLE (WM_USER + 56) #endif -/* Hint from a newsgroup for custom flatbar drawing: -Set the TBSTYLE_CUSTOMERASE style, then handle the -NM_CUSTOMDRAW message and do your custom drawing. -*/ - +// these values correspond to those used by comctl32.dll #define DEFAULTBITMAPX 16 #define DEFAULTBITMAPY 15 #define DEFAULTBUTTONX 24 #define DEFAULTBUTTONY 24 #define DEFAULTBARHEIGHT 27 +// ---------------------------------------------------------------------------- +// function prototypes +// ---------------------------------------------------------------------------- + +static void wxMapBitmap(HBITMAP hBitmap, int width, int height); + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase) + IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) #endif BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase) @@ -83,15 +104,21 @@ BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase) EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged) END_EVENT_TABLE() -static void wxMapBitmap(HBITMAP hBitmap, int width, int height); +// ============================================================================ +// implementation +// ============================================================================ -wxToolBar95::wxToolBar95() +// ---------------------------------------------------------------------------- +// wxToolBar95 construction +// ---------------------------------------------------------------------------- + +void wxToolBar95::Init() { - m_maxWidth = -1; - m_maxHeight = -1; - m_hBitmap = 0; - m_defaultWidth = DEFAULTBITMAPX; - m_defaultHeight = DEFAULTBITMAPY; + m_maxWidth = -1; + m_maxHeight = -1; + m_hBitmap = 0; + m_defaultWidth = DEFAULTBITMAPX; + m_defaultHeight = DEFAULTBITMAPY; } bool wxToolBar95::Create(wxWindow *parent, @@ -101,254 +128,356 @@ bool wxToolBar95::Create(wxWindow *parent, long style, const wxString& name) { - m_hWnd = 0; + wxASSERT_MSG( (style & wxTB_VERTICAL) == 0, + wxT("Sorry, wxToolBar95 under Windows 95 only " + "supports horizontal orientation.") ); - m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)), - GetGValue(GetSysColor(COLOR_BTNFACE)), - GetBValue(GetSysColor(COLOR_BTNFACE))); - m_foregroundColour = *wxBLACK ; - - wxASSERT_MSG( (style & wxTB_VERTICAL) == 0, - T("Sorry, wxToolBar95 under Windows 95 only " - "supports horizontal orientation.") ); + // common initialisation + if ( !CreateControl(parent, id, pos, size, style, name) ) + return FALSE; - m_maxWidth = -1; - m_maxHeight = -1; + // prepare flags + DWORD msflags = 0; // WS_VISIBLE | WS_CHILD always included + if (style & wxBORDER) + msflags |= WS_BORDER; + msflags |= TBSTYLE_TOOLTIPS; - m_hBitmap = 0; + if (style & wxTB_FLAT) + { + if (wxTheApp->GetComCtl32Version() > 400) + msflags |= TBSTYLE_FLAT; + } - m_defaultWidth = DEFAULTBITMAPX; - m_defaultHeight = DEFAULTBITMAPY; - SetName(name); + // MSW-specific initialisation + if ( !wxControl::MSWCreateControl(TOOLBARCLASSNAME, msflags) ) + return FALSE; - m_windowStyle = style; + // toolbar-specific post initialisation + ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); - SetParent(parent); + // set up the colors and fonts + wxRGBToColour(m_backgroundColour, GetSysColor(COLOR_BTNFACE)); + m_foregroundColour = *wxBLACK; - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); - if (width <= 0) - width = 100; - if (height <= 0) - height = 30; - if (x < 0) - x = 0; - if (y < 0) - y = 0; + // position it + int x = pos.x; + int y = pos.y; + int width = size.x; + int height = size.y; - m_windowId = (id < 0 ? NewControlId() : id); - DWORD msflags = 0; - if (style & wxBORDER) - msflags |= WS_BORDER; - msflags |= WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS; + if (width <= 0) + width = 100; + if (height <= 0) + height = m_defaultHeight; + if (x < 0) + x = 0; + if (y < 0) + y = 0; - if (style & wxTB_FLAT) - { - if (wxTheApp->GetComCtl32Version() > 400) - msflags |= TBSTYLE_FLAT; - } + SetSize(x, y, width, height); - bool want3D; - WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; - - // Even with extended styles, need to combine with WS_BORDER - // for them to look right. - if ( want3D || wxStyleHasBorder(m_windowStyle) ) - msflags |= WS_BORDER; - - // Create the toolbar control. - HWND hWndToolbar = CreateWindowEx - ( - exStyle, // Extended styles. - TOOLBARCLASSNAME, // Class name for the toolbar. - T(""), // No default text. - msflags, // Styles - x, y, width, height, // Standard toolbar size and position. - (HWND) parent->GetHWND(), // Parent window of the toolbar. - (HMENU)m_windowId, // Toolbar ID. - wxGetInstance(), // Current instance. - NULL // No class data. - ); - - wxCHECK_MSG( hWndToolbar, FALSE, T("Toolbar creation failed") ); - - // Toolbar-specific initialisation - ::SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE, - (WPARAM)sizeof(TBBUTTON), (LPARAM)0); - - m_hWnd = (WXHWND) hWndToolbar; - if (parent) - parent->AddChild(this); - - SubclassWin((WXHWND)hWndToolbar); - - return TRUE; + return TRUE; } wxToolBar95::~wxToolBar95() { - UnsubclassWin(); + UnsubclassWin(); - if (m_hBitmap) - { - ::DeleteObject((HBITMAP) m_hBitmap); - m_hBitmap = 0; - } + if (m_hBitmap) + { + ::DeleteObject((HBITMAP) m_hBitmap); + } +} + +void wxToolBar95::ClearTools() +{ + // TODO: Don't know how to reset the toolbar bitmap, as yet. + // But adding tools and calling CreateTools should probably + // recreate a buttonbar OK. + wxToolBarBase::ClearTools(); +} + +bool wxToolBar95::AddControl(wxControl *control) +{ + wxCHECK_MSG( control, FALSE, _T("toolbar: can't insert NULL control") ); + + wxCHECK_MSG( control->GetParent() == this, FALSE, + _T("control must have toolbar as parent") ); + + wxToolBarTool *tool = new wxToolBarTool(control); + + m_tools.Append(control->GetId(), tool); + + return TRUE; +} + +wxToolBarTool *wxToolBar95::AddTool(int index, + const wxBitmap& bitmap, + const wxBitmap& pushedBitmap, + bool toggle, + long xPos, long yPos, + wxObject *clientData, + const wxString& helpString1, + const wxString& helpString2) +{ + wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, + toggle, xPos, yPos, + helpString1, helpString2); + tool->m_clientData = clientData; + + if (xPos > -1) + tool->m_x = xPos; + else + tool->m_x = m_xMargin; + + if (yPos > -1) + tool->m_y = yPos; + else + tool->m_y = m_yMargin; + + tool->SetSize(GetToolSize().x, GetToolSize().y); + + m_tools.Append((long)index, tool); + + return tool; } bool wxToolBar95::CreateTools() { - if (m_tools.Number() == 0) - return FALSE; + size_t nTools = m_tools.GetCount(); + if ( nTools == 0 ) + return FALSE; - HBITMAP oldToolBarBitmap = (HBITMAP) m_hBitmap; + HBITMAP oldToolBarBitmap = (HBITMAP) m_hBitmap; - int totalBitmapWidth = (int)(m_defaultWidth * m_tools.Number()); - int totalBitmapHeight = (int)m_defaultHeight; + int totalBitmapWidth = (int)(m_defaultWidth * nTools); + int totalBitmapHeight = (int)m_defaultHeight; - // Create a bitmap for all the tool bitmaps - HDC dc = ::GetDC(NULL); - m_hBitmap = (WXHBITMAP) ::CreateCompatibleBitmap(dc, totalBitmapWidth, totalBitmapHeight); - ::ReleaseDC(NULL, dc); + // Create a bitmap for all the tool bitmaps + HDC dc = ::GetDC(NULL); + m_hBitmap = (WXHBITMAP) ::CreateCompatibleBitmap(dc, + totalBitmapWidth, + totalBitmapHeight); + ::ReleaseDC(NULL, dc); - // Now blit all the tools onto this bitmap - HDC memoryDC = ::CreateCompatibleDC(NULL); - HBITMAP oldBitmap = (HBITMAP) ::SelectObject(memoryDC, (HBITMAP) m_hBitmap); + // Now blit all the tools onto this bitmap + HDC memoryDC = ::CreateCompatibleDC(NULL); + HBITMAP oldBitmap = (HBITMAP) ::SelectObject(memoryDC, (HBITMAP)m_hBitmap); - HDC memoryDC2 = ::CreateCompatibleDC(NULL); - int x = 0; - wxNode *node = m_tools.First(); - int noButtons = 0; - while (node) - { - wxToolBarTool *tool = (wxToolBarTool *)node->Data(); - if ((tool->m_toolStyle != wxTOOL_STYLE_SEPARATOR) && tool->m_bitmap1.Ok() && tool->m_bitmap1.GetHBITMAP()) - { -// wxPalette *palette = tool->m_bitmap1->GetPalette(); - - HBITMAP oldBitmap2 = (HBITMAP) ::SelectObject(memoryDC2, (HBITMAP) tool->m_bitmap1.GetHBITMAP()); - /* int bltResult = */ - BitBlt(memoryDC, x, 0, (int) m_defaultWidth, (int) m_defaultHeight, memoryDC2, - 0, 0, SRCCOPY); - ::SelectObject(memoryDC2, oldBitmap2); - x += (int)m_defaultWidth; - noButtons ++; - } - node = node->Next(); - } - ::SelectObject(memoryDC, oldBitmap); - ::DeleteDC(memoryDC); - ::DeleteDC(memoryDC2); + HDC memoryDC2 = ::CreateCompatibleDC(NULL); - // Map to system colours - wxMapBitmap((HBITMAP) m_hBitmap, totalBitmapWidth, totalBitmapHeight); + // the button position + wxCoord x = 0; - if ( oldToolBarBitmap ) - { - TBREPLACEBITMAP replaceBitmap; - replaceBitmap.hInstOld = NULL; - replaceBitmap.hInstNew = NULL; - replaceBitmap.nIDOld = (UINT) oldToolBarBitmap; - replaceBitmap.nIDNew = (UINT) (HBITMAP) m_hBitmap; - replaceBitmap.nButtons = noButtons; - if (::SendMessage((HWND) GetHWND(), TB_REPLACEBITMAP, (WPARAM) 0, (LPARAM) &replaceBitmap) == -1) + // the number of buttons (not separators) + int noButtons = 0; + + wxNode *node = m_tools.First(); + while (node) { - wxFAIL_MSG(T("Could not add bitmap to toolbar")); + wxToolBarTool *tool = (wxToolBarTool *)node->Data(); + if ( tool->m_toolStyle == wxTOOL_STYLE_BUTTON && tool->m_bitmap1.Ok() ) + { + HBITMAP hbmp = GetHbitmapOf(tool->m_bitmap1); + if ( hbmp ) + { + HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp); + if ( !BitBlt(memoryDC, x, 0, m_defaultWidth, m_defaultHeight, + memoryDC2, 0, 0, SRCCOPY) ) + { + wxLogLastError("BitBlt"); + } + + ::SelectObject(memoryDC2, oldBitmap2); + + x += m_defaultWidth; + noButtons++; + } + } + node = node->Next(); } - ::DeleteObject((HBITMAP) oldToolBarBitmap); + ::SelectObject(memoryDC, oldBitmap); + ::DeleteDC(memoryDC); + ::DeleteDC(memoryDC2); - // Now delete all the buttons - int i = 0; - while ( TRUE ) + // Map to system colours + wxMapBitmap((HBITMAP) m_hBitmap, totalBitmapWidth, totalBitmapHeight); + + if ( oldToolBarBitmap ) { - // TODO: What about separators???? They don't have an id! - if ( ! ::SendMessage( (HWND) GetHWND(), TB_DELETEBUTTON, i, 0 ) ) - break; + TBREPLACEBITMAP replaceBitmap; + replaceBitmap.hInstOld = NULL; + replaceBitmap.hInstNew = NULL; + replaceBitmap.nIDOld = (UINT) oldToolBarBitmap; + replaceBitmap.nIDNew = (UINT) (HBITMAP) m_hBitmap; + replaceBitmap.nButtons = noButtons; + if ( ::SendMessage(GetHwnd(), TB_REPLACEBITMAP, + 0, (LPARAM) &replaceBitmap) == -1 ) + { + wxFAIL_MSG(wxT("Could not add bitmap to toolbar")); + } + + ::DeleteObject((HBITMAP) oldToolBarBitmap); + + // Now delete all the buttons + int i = 0; + while ( TRUE ) + { + // TODO: What about separators???? They don't have an id! + if ( ! ::SendMessage( GetHwnd(), TB_DELETEBUTTON, i, 0 ) ) + break; + } } - } - else - { - TBADDBITMAP addBitmap; - addBitmap.hInst = 0; - addBitmap.nID = (UINT)m_hBitmap; - if (::SendMessage((HWND) GetHWND(), TB_ADDBITMAP, (WPARAM) noButtons, (LPARAM) &addBitmap) == -1) + else { - wxFAIL_MSG(T("Could not add bitmap to toolbar")); + TBADDBITMAP addBitmap; + addBitmap.hInst = 0; + addBitmap.nID = (UINT)m_hBitmap; + if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP, + (WPARAM) noButtons, (LPARAM)&addBitmap) == -1 ) + { + wxFAIL_MSG(wxT("Could not add bitmap to toolbar")); + } } - } - // Now add the buttons. - TBBUTTON buttons[50]; + // Now add the buttons. + TBBUTTON *buttons = new TBBUTTON[nTools]; - node = m_tools.First(); - int i = 0; - int bitmapId = 0; - while (node) - { - wxToolBarTool *tool = (wxToolBarTool *)node->Data(); - if (tool->m_toolStyle == wxTOOL_STYLE_SEPARATOR) + // this array will holds the indices of all controls in the toolbar + wxArrayInt controlIds; + + int i = 0; + int bitmapId = 0; + + node = m_tools.First(); + while (node) { - buttons[i].iBitmap = 0; - buttons[i].idCommand = 0; + wxToolBarTool *tool = (wxToolBarTool *)node->Data(); + TBBUTTON& button = buttons[i]; + + wxZeroMemory(button); - buttons[i].fsState = TBSTATE_ENABLED; - buttons[i].fsStyle = TBSTYLE_SEP; - buttons[i].dwData = 0L; - buttons[i].iString = 0; + switch ( tool->m_toolStyle ) + { + case wxTOOL_STYLE_CONTROL: + controlIds.Add(i); + button.idCommand = tool->m_index; + // fall through: create just a separator too + + case wxTOOL_STYLE_SEPARATOR: + button.fsState = TBSTATE_ENABLED; + button.fsStyle = TBSTYLE_SEP; + break; + + case wxTOOL_STYLE_BUTTON: + button.iBitmap = bitmapId; + button.idCommand = tool->m_index; + + if (tool->m_enabled) + button.fsState |= TBSTATE_ENABLED; + if (tool->m_toggleState) + button.fsState |= TBSTATE_CHECKED; + button.fsStyle = tool->m_isToggle ? TBSTYLE_CHECK + : TBSTYLE_BUTTON; + + bitmapId++; + break; + } + + i++; + node = node->Next(); } - else + + if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, + (WPARAM)i, (LPARAM)buttons) ) { - buttons[i].iBitmap = bitmapId; - buttons[i].idCommand = tool->m_index; - - buttons[i].fsState = 0; - if (tool->m_enabled) - buttons[i].fsState |= TBSTATE_ENABLED; - if (tool->m_toggleState) - buttons[i].fsState |= TBSTATE_CHECKED; - buttons[i].fsStyle = tool->m_isToggle ? TBSTYLE_CHECK : TBSTYLE_BUTTON; - buttons[i].dwData = 0L; - buttons[i].iString = 0; - - bitmapId ++; + wxLogLastError("TB_ADDBUTTONS"); } - i ++; - node = node->Next(); - } + delete [] buttons; - long rc = ::SendMessage((HWND) GetHWND(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)& buttons); + // TBBUTTONINFO struct declaration is new (comctl32.dll 4.70+) +#if !defined(__GNUWIN32__) && !defined(__WATCOMC__) && !defined(__BORLANDC__) + // adjust the controls size to fit nicely in the toolbar + size_t nControls = controlIds.GetCount(); + for ( size_t nCtrl = 0; nCtrl < nControls; nCtrl++ ) + { + wxToolBarTool *tool = (wxToolBarTool *) + m_tools.Nth(controlIds[nCtrl])->Data(); + wxControl *control = tool->GetControl(); + + wxSize size = control->GetSize(); + + // set the (underlying) separators width to be that of the control + TBBUTTONINFO tbbi; + tbbi.cbSize = sizeof(tbbi); + tbbi.dwMask = TBIF_SIZE; + tbbi.cx = size.x; + if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO, + tool->m_index, (LPARAM)&tbbi) ) + { + // the index is probably invalid + wxLogLastError("TB_SETBUTTONINFO"); + } - wxCHECK_MSG( rc, FALSE, T("failed to add buttons to the toolbar") ); + // and position the control itself correctly vertically + RECT r; + if ( !SendMessage(GetHwnd(), TB_GETRECT, + tool->m_index, (LPARAM)(LPRECT)&r) ) + { + wxLogLastError("TB_GETRECT"); + } + + int height = r.bottom - r.top; + int diff = height - size.y; + if ( diff < 0 ) + { + // the control is too high, resize to fit + control->SetSize(-1, height - 2); + + diff = 2; + } - (void)::SendMessage((HWND) GetHWND(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0); + control->Move(r.left, r.top + diff / 2); + } +#endif // __GNUWIN32__ + + (void)::SendMessage(GetHwnd(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0); - SetRows(m_maxRows); + SetRows(m_maxRows); - return TRUE; + return TRUE; } +// ---------------------------------------------------------------------------- +// message handlers +// ---------------------------------------------------------------------------- + bool wxToolBar95::MSWCommand(WXUINT cmd, WXWORD id) { - wxNode *node = m_tools.Find((long)id); - if (!node) - return FALSE; - wxToolBarTool *tool = (wxToolBarTool *)node->Data(); - if (tool->m_isToggle) - tool->m_toggleState = (1 == (1 & (int)::SendMessage((HWND) GetHWND(), TB_GETSTATE, (WPARAM) id, (LPARAM) 0))); - - BOOL ret = OnLeftClick((int)id, tool->m_toggleState); - if (ret == FALSE && tool->m_isToggle) - { - tool->m_toggleState = !tool->m_toggleState; - ::SendMessage((HWND) GetHWND(), TB_CHECKBUTTON, (WPARAM)id, (LPARAM)MAKELONG(tool->m_toggleState, 0)); - } - return TRUE; + wxNode *node = m_tools.Find((long)id); + if (!node) + return FALSE; + + wxToolBarTool *tool = (wxToolBarTool *)node->Data(); + if (tool->m_isToggle) + { + LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0); + tool->m_toggleState = state & TBSTATE_CHECKED; + } + + BOOL ret = OnLeftClick((int)id, tool->m_toggleState); + if ( ret == FALSE && tool->m_isToggle ) + { + tool->m_toggleState = !tool->m_toggleState; + ::SendMessage(GetHwnd(), TB_CHECKBUTTON, + (WPARAM)id, (LPARAM)MAKELONG(tool->m_toggleState, 0)); + } + + return TRUE; } bool wxToolBar95::MSWOnNotify(int WXUNUSED(idCtrl), @@ -358,9 +487,10 @@ bool wxToolBar95::MSWOnNotify(int WXUNUSED(idCtrl), // 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 - if ( (hdr->code != TTN_NEEDTEXTA) && (hdr->code != TTN_NEEDTEXTW) ) + // 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) ) return FALSE; HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0); @@ -379,7 +509,7 @@ bool wxToolBar95::MSWOnNotify(int WXUNUSED(idCtrl), if ( !help.IsEmpty() ) { - if ( hdr->code == TTN_NEEDTEXTA ) + if ( code == TTN_NEEDTEXTA ) { ttText->lpszText = (wxChar *)help.c_str(); } @@ -418,101 +548,87 @@ bool wxToolBar95::MSWOnNotify(int WXUNUSED(idCtrl), return TRUE; } +// ---------------------------------------------------------------------------- +// sizing stuff +// ---------------------------------------------------------------------------- + void wxToolBar95::SetToolBitmapSize(const wxSize& size) { - m_defaultWidth = size.x; - m_defaultHeight = size.y; - ::SendMessage((HWND) GetHWND(), TB_SETBITMAPSIZE, 0, (LPARAM) MAKELONG ((int)size.x, (int)size.y)); + wxToolBarBase::SetToolBitmapSize(size); + + ::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y)); } void wxToolBar95::SetRows(int nRows) { - RECT rect; - ::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(nRows, TRUE), (LPARAM) & rect); - m_maxWidth = (rect.right - rect.left + 2); - m_maxHeight = (rect.bottom - rect.top + 2); + // TRUE in wParam means to create at least as many rows + RECT rect; + ::SendMessage(GetHwnd(), TB_SETROWS, + MAKEWPARAM(nRows, TRUE), (LPARAM) &rect); + + m_maxWidth = (rect.right - rect.left + 2); + m_maxHeight = (rect.bottom - rect.top + 2); + + m_maxRows = nRows; } wxSize wxToolBar95::GetMaxSize() const { - if ((m_maxWidth == -1) || (m_maxHeight == -1)) - { - RECT rect; - ::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(m_maxRows, TRUE), (LPARAM) & rect); - ((wxToolBar95 *)this)->m_maxWidth = (rect.right - rect.left + 2); // ??? - ((wxToolBar95 *)this)->m_maxHeight = (rect.bottom - rect.top + 2); // ??? - } - return wxSize(m_maxWidth, m_maxHeight); + if ( (m_maxWidth == -1) || (m_maxHeight == -1) ) + { + // it has a side effect of filling m_maxWidth/Height variables + ((wxToolBar95 *)this)->SetRows(m_maxRows); // const_cast + } + + return wxSize(m_maxWidth, m_maxHeight); } // The button size is bigger than the bitmap size wxSize wxToolBar95::GetToolSize() const { - return wxSize(m_defaultWidth + 8, m_defaultHeight + 7); + // FIXME: this is completely bogus (VZ) + return wxSize(m_defaultWidth + 8, m_defaultHeight + 7); } +// ---------------------------------------------------------------------------- +// tool state +// ---------------------------------------------------------------------------- + void wxToolBar95::EnableTool(int toolIndex, bool enable) { - wxNode *node = m_tools.Find((long)toolIndex); - if (node) - { - wxToolBarTool *tool = (wxToolBarTool *)node->Data(); - tool->m_enabled = enable; - ::SendMessage((HWND) GetHWND(), TB_ENABLEBUTTON, (WPARAM)toolIndex, (LPARAM)MAKELONG(enable, 0)); - } + wxNode *node = m_tools.Find((long)toolIndex); + if (node) + { + wxToolBarTool *tool = (wxToolBarTool *)node->Data(); + tool->m_enabled = enable; + ::SendMessage(GetHwnd(), TB_ENABLEBUTTON, + (WPARAM)toolIndex, (LPARAM)MAKELONG(enable, 0)); + } } void wxToolBar95::ToggleTool(int toolIndex, bool toggle) { - wxNode *node = m_tools.Find((long)toolIndex); - if (node) - { - wxToolBarTool *tool = (wxToolBarTool *)node->Data(); - if (tool->m_isToggle) + wxNode *node = m_tools.Find((long)toolIndex); + if (node) { - tool->m_toggleState = toggle; - ::SendMessage((HWND) GetHWND(), TB_CHECKBUTTON, (WPARAM)toolIndex, (LPARAM)MAKELONG(toggle, 0)); + wxToolBarTool *tool = (wxToolBarTool *)node->Data(); + if (tool->m_isToggle) + { + tool->m_toggleState = toggle; + ::SendMessage(GetHwnd(), TB_CHECKBUTTON, + (WPARAM)toolIndex, (LPARAM)MAKELONG(toggle, 0)); + } } - } } bool wxToolBar95::GetToolState(int toolIndex) const { - return (::SendMessage((HWND) GetHWND(), TB_ISBUTTONCHECKED, (WPARAM)toolIndex, (LPARAM)0) != 0); -} - -void wxToolBar95::ClearTools() -{ - // TODO: Don't know how to reset the toolbar bitmap, as yet. - // But adding tools and calling CreateTools should probably - // recreate a buttonbar OK. - wxToolBarBase::ClearTools(); + return (::SendMessage(GetHwnd(), TB_ISBUTTONCHECKED, (WPARAM)toolIndex, (LPARAM)0) != 0); } -// If pushedBitmap is NULL, a reversed version of bitmap is -// created and used as the pushed/toggled image. -// If toggle is TRUE, the button toggles between the two states. -wxToolBarTool *wxToolBar95::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap, - bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2) -{ - wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2); - tool->m_clientData = clientData; - - if (xPos > -1) - tool->m_x = xPos; - else - tool->m_x = m_xMargin; - - if (yPos > -1) - tool->m_y = yPos; - else - tool->m_y = m_yMargin; - - tool->SetSize(GetToolSize().x, GetToolSize().y); - - m_tools.Append((long)index, tool); - return tool; -} +// ---------------------------------------------------------------------------- +// event handlers +// ---------------------------------------------------------------------------- // Responds to colour changes, and passes event on to children. void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event) @@ -543,9 +659,15 @@ void wxToolBar95::OnMouseEvent(wxMouseEvent& event) } } +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + // These are the default colors used to map the bitmap colors // to the current system colors +// VZ: why are they BGR and not RGB? just to confuse the people or is there a +// deeper reason? #define BGR_BUTTONTEXT (RGB(000,000,000)) // black #define BGR_BUTTONSHADOW (RGB(128,128,128)) // dark grey #define BGR_BUTTONFACE (RGB(192,192,192)) // bright grey @@ -555,7 +677,8 @@ void wxToolBar95::OnMouseEvent(wxMouseEvent& event) void wxMapBitmap(HBITMAP hBitmap, int width, int height) { - COLORMAP ColorMap[] = { + COLORMAP ColorMap[] = + { {BGR_BUTTONTEXT, COLOR_BTNTEXT}, // black {BGR_BUTTONSHADOW, COLOR_BTNSHADOW}, // dark grey {BGR_BUTTONFACE, COLOR_BTNFACE}, // bright grey @@ -639,4 +762,4 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height) #endif -#endif +#endif // !(wxUSE_TOOLBAR && Win95)