#include "wx/toolbar.h"
#include "wx/sysopt.h"
+#include "wx/image.h"
#include "wx/msw/private.h"
void wxToolBar::Init()
{
m_hBitmap = 0;
+ m_disabledImgList = NULL;
m_nButtons = 0;
m_hBitmap = 0;
}
+ if ( m_disabledImgList )
+ {
+ delete m_disabledImgList;
+ m_disabledImgList = NULL;
+ }
+
Realize();
UpdateSize();
}
{
::DeleteObject((HBITMAP) m_hBitmap);
}
+
+ delete m_disabledImgList;
}
wxSize wxToolBar::DoGetBestSize() const
if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
{
// static as it doesn't change during the program lifetime
- static int s_verComCtl = wxTheApp->GetComCtl32Version();
+ static int s_verComCtl = wxApp::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
return true;
}
+void wxToolBar::CreateDisabledImageList()
+{
+ // as we can't use disabled image list with older versions of comctl32.dll,
+ // don't even bother creating it
+ if ( wxTheApp->GetComCtl32Version() >= 470 )
+ {
+ // search for the first disabled button img in the toolbar, if any
+ for ( wxToolBarToolsList::compatibility_iterator
+ node = m_tools.GetFirst(); node; node = node->GetNext() )
+ {
+ wxToolBarToolBase *tool = node->GetData();
+ wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+ if ( bmpDisabled.Ok() )
+ {
+ m_disabledImgList = new wxImageList
+ (
+ m_defaultWidth,
+ m_defaultHeight,
+ bmpDisabled.GetMask() != NULL,
+ GetToolsCount()
+ );
+ return;
+ }
+ }
+
+ // we don't have any disabled bitmaps
+ }
+
+ m_disabledImgList = NULL;
+}
+
bool wxToolBar::Realize()
{
const size_t nTools = GetToolsCount();
const bool isVertical = HasFlag(wxTB_VERTICAL);
bool doRemap, doRemapBg, doTransparent;
+#ifdef __WXWINCE__
+ doRemapBg = false;
+ doRemap = false;
+ doTransparent = false;
+#else
if (wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 2)
{
doRemapBg = doRemap = false;
doRemapBg = !doRemap;
doTransparent = false;
}
+#endif
// delete all old buttons, if any
for ( size_t pos = 0; pos < m_nButtons; pos++ )
wxMemoryDC dcAllButtons;
wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
dcAllButtons.SelectObject(bitmap);
+#ifdef __WXWINCE__
+ dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
+#else
if (doTransparent)
dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
else
- dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
+ dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
+#endif
dcAllButtons.Clear();
m_hBitmap = bitmap.GetHBITMAP();
HBITMAP hBitmap = (HBITMAP)m_hBitmap;
+#ifndef __WXWINCE__
if (doRemapBg)
{
dcAllButtons.SelectObject(wxNullBitmap);
totalBitmapWidth, totalBitmapHeight);
dcAllButtons.SelectObject(bitmap);
+
+
}
+#endif // !__WXWINCE__
// the button position
wxCoord x = 0;
// the number of buttons (not separators)
int nButtons = 0;
+ CreateDisabledImageList();
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
wxToolBarToolBase *tool = node->GetData();
if ( tool->IsButton() )
{
const wxBitmap& bmp = tool->GetNormalBitmap();
+
+ const int w = bmp.GetWidth();
+ const int h = bmp.GetHeight();
+
if ( bmp.Ok() )
{
- int xOffset = wxMax(0, (m_defaultWidth - bmp.GetWidth())/2);
- int yOffset = wxMax(0, (m_defaultHeight - bmp.GetHeight())/2);
+ int xOffset = wxMax(0, (m_defaultWidth - w)/2);
+ int yOffset = wxMax(0, (m_defaultHeight - h)/2);
+
// notice the last parameter: do use mask
- dcAllButtons.DrawBitmap(bmp, x+xOffset, yOffset, true);
+ dcAllButtons.DrawBitmap(bmp, x + xOffset, yOffset, true);
}
else
{
wxFAIL_MSG( _T("invalid tool button bitmap") );
}
+ // also deal with disabled bitmap if we want to use them
+ if ( m_disabledImgList )
+ {
+ wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+#if wxUSE_IMAGE
+ if ( !bmpDisabled.Ok() )
+ {
+ // no disabled bitmap specified but we still need to
+ // fill the space in the image list with something, so
+ // we grey out the normal bitmap
+ wxImage imgGreyed;
+ wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
+
+ // we need to have light grey background colour for
+ // MapBitmap() to work correctly
+ for ( int y = 0; y < h; y++ )
+ {
+ for ( int x = 0; x < w; x++ )
+ {
+ if ( imgGreyed.IsTransparent(x, y) )
+ imgGreyed.SetRGB(x, y,
+ wxLIGHT_GREY->Red(),
+ wxLIGHT_GREY->Green(),
+ wxLIGHT_GREY->Blue());
+ }
+ }
+
+ bmpDisabled = wxBitmap(imgGreyed);
+ }
+#endif // wxUSE_IMAGE
+
+ MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+
+ m_disabledImgList->Add(bmpDisabled);
+ }
+
// 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)
// Map to system colours
hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
totalBitmapWidth, totalBitmapHeight);
+
+
}
bool addBitmap = true;
if ( oldToolBarBitmap )
{
#ifdef TB_REPLACEBITMAP
- if ( wxTheApp->GetComCtl32Version() >= 400 )
+ if ( wxApp::GetComCtl32Version() >= 400 )
{
TBREPLACEBITMAP replaceBitmap;
replaceBitmap.hInstOld = NULL;
wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
}
}
+
+ if ( m_disabledImgList )
+ {
+ HIMAGELIST oldImageList = (HIMAGELIST)
+ ::SendMessage(GetHwnd(),
+ TB_SETDISABLEDIMAGELIST,
+ 0,
+ (LPARAM)GetHimagelistOf(m_disabledImgList));
+
+ // delete previous image list if any
+ if ( oldImageList )
+ ::DeleteObject( oldImageList );
+ }
}
// don't call SetToolBitmapSize() as we don't want to change the values of
// 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 )
+ wxApp::GetComCtl32Version() <= 472 )
{
continue;
}
// radio items
button.fsState |= TBSTATE_CHECKED;
- tool->Toggle(true);
+ if (tool->Toggle(true))
+ {
+ DoToggleTool(tool, true);
+ }
+ }
+ else if (tool->IsToggled())
+ {
+ wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+ int prevIndex = i - 1;
+ while ( nodePrev )
+ {
+ TBBUTTON& prevButton = buttons[prevIndex];
+ wxToolBarToolBase *tool = nodePrev->GetData();
+ if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+ break;
+
+ if ( tool->Toggle(false) )
+ {
+ DoToggleTool(tool, false);
+ }
+ prevButton.fsState = TBSTATE_ENABLED;
+ nodePrev = nodePrev->GetPrevious();
+ prevIndex--;
+ }
}
isRadio = true;
#ifdef TB_SETBUTTONINFO
// available in headers, now check whether it is available now
// (during run-time)
- if ( wxTheApp->GetComCtl32Version() >= 471 )
+ if ( wxApp::GetComCtl32Version() >= 471 )
{
// set the (underlying) separators width to be that of the
// control
LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);
toggled = (state & TBSTATE_CHECKED) != 0;
- // ignore the event when a radio button is released, as this doesn't seem to
- // happen at all, and is handled otherwise
+ // 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;
// revert back
tool->Toggle(!toggled);
- ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0));
+ ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(!toggled, 0));
}
return true;
#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
&& !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
&& !defined (__DIGITALMARS__)
- if ( wxTheApp->GetComCtl32Version() >= 470 )
+ if ( wxApp::GetComCtl32Version() >= 470 )
{
DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
{
wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();
- for ( ; current != 0; current = current->GetNext() )
+ for ( ; current ; current = current->GetNext() )
{
if ( index == 0 )
return current->GetData();
// if comctl32 version < 4.71 wxToolBar95 adds dummy spacers
#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
- if ( wxTheApp->GetComCtl32Version() >= 471 )
+ if ( wxApp::GetComCtl32Version() >= 471 )
{
return m_tools.Item((size_t)index)->GetData();
}
event.Skip();
return;
}
-
+
// notice that this 'dumb' implementation may cause flicker for some of the
// controls in which case they should intercept wxEraseEvent and process it
// themselves somehow
{
switch ( nMsg )
{
- 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
+ // wxControl::MSWWindowProc (HandleMouseMove just calls OnMouseEnter)
HandleMouseMove(wParam, lParam);
break;
+ case WM_SIZE:
+ if ( HandleSize(wParam, lParam) )
+ return 0;
+ break;
+
+#ifndef __WXWINCE__
case WM_PAINT:
if ( HandlePaint(wParam, lParam) )
return 0;
+#endif
}
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
projects / wxWidgets.git / blobdiff