#include "wx/msw/dib.h"
#include "wx/app.h" // for GetComCtl32Version
+#if defined(__MWERKS__) && defined(__WXMSW__)
+// including <windef.h> 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
// ----------------------------------------------------------------------------
#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
// Messages
#ifndef TB_GETSTYLE
#define DEFAULTBUTTONY 24
#define DEFAULTBARHEIGHT 27
-// ----------------------------------------------------------------------------
-// private function prototypes
-// ----------------------------------------------------------------------------
-
-// adjust toolbar bitmap colours
-// static void wxMapBitmap(HBITMAP hBitmap, int width, int height);
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
m_defaultWidth = DEFAULTBITMAPX;
m_defaultHeight = DEFAULTBITMAPY;
+
+ m_pInTool = 0;
}
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
- if (style & wxBORDER)
- msflags |= WS_BORDER;
if ( style & wxCLIP_SIBLINGS )
msflags |= WS_CLIPSIBLINGS;
if (style & wxTB_FLAT)
{
- if (wxTheApp->GetComCtl32Version() > 400)
- msflags |= TBSTYLE_FLAT;
+ // 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 )
+ {
+ msflags |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
+ }
}
// MSW-specific initialisation
::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
// set up the colors and fonts
- wxRGBToColour(m_backgroundColour, GetSysColor(COLOR_BTNFACE));
- m_foregroundColour = *wxBLACK;
-
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// position it
int x = pos.x;
#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
// Map to system colours
- MapBitmap((WXHBITMAP) hBitmap, totalBitmapWidth, totalBitmapHeight);
+ hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+ totalBitmapWidth, totalBitmapHeight);
int bitmapId = 0;
// ------------------------------
// adjust the controls size to fit nicely in the toolbar
+ int y = 0;
size_t index = 0;
for ( node = m_tools.GetFirst(); node; node = node->GetNext(), index++ )
{
wxToolBarToolBase *tool = node->GetData();
- if ( !tool->IsControl() )
- continue;
-
- wxControl *control = tool->GetControl();
- wxSize size = control->GetSize();
-
- // the position of the leftmost controls corner
- int left = -1;
+ // we calculate the running y coord for vertical toolbars so we need to
+ // get the items size for all items but for the horizontal ones we
+ // don't need to deal with the non controls
+ bool isControl = tool->IsControl();
+ if ( !isControl && !isVertical )
+ continue;
// note that we use TB_GETITEMRECT and not TB_GETRECT because the
// latter only appeared in v4.70 of comctl32.dll
wxLogLastError(wxT("TB_GETITEMRECT"));
}
+ if ( !isControl )
+ {
+ // can only be control if isVertical
+ y += r.bottom - r.top;
+
+ continue;
+ }
+
+ wxControl *control = tool->GetControl();
+
+ wxSize size = control->GetSize();
+
+ // the position of the leftmost controls corner
+ int left = -1;
+
// TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
- #if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
- // available in headers, now check whether it is available now
- // (during run-time)
- if ( wxTheApp->GetComCtl32Version() >= 471 )
+#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
+ // available in headers, now check whether it is available now
+ // (during run-time)
+ if ( wxTheApp->GetComCtl32Version() >= 471 )
+ {
+ // 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->GetId(), (LPARAM)&tbbi) )
{
- // 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->GetId(), (LPARAM)&tbbi) )
- {
- // the id is probably invalid?
- wxLogLastError(wxT("TB_SETBUTTONINFO"));
- }
+ // the id is probably invalid?
+ wxLogLastError(wxT("TB_SETBUTTONINFO"));
}
- else
- #endif // comctl32.dll 4.71
- // TB_SETBUTTONINFO unavailable
+ }
+ else
+#endif // comctl32.dll 4.71
+ // TB_SETBUTTONINFO unavailable
+ {
+ // try adding several separators to fit the controls width
+ int widthSep = r.right - r.left;
+ left = r.left;
+
+ TBBUTTON tbb;
+ wxZeroMemory(tbb);
+ tbb.idCommand = 0;
+ tbb.fsState = TBSTATE_ENABLED;
+ tbb.fsStyle = TBSTYLE_SEP;
+
+ size_t nSeparators = size.x / widthSep;
+ for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
{
- // try adding several separators to fit the controls width
- int widthSep = r.right - r.left;
- left = r.left;
-
- TBBUTTON tbb;
- wxZeroMemory(tbb);
- tbb.idCommand = 0;
- tbb.fsState = TBSTATE_ENABLED;
- tbb.fsStyle = TBSTYLE_SEP;
-
- size_t nSeparators = size.x / widthSep;
- for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
+ if ( !SendMessage(GetHwnd(), TB_INSERTBUTTON,
+ index, (LPARAM)&tbb) )
{
- if ( !SendMessage(GetHwnd(), TB_INSERTBUTTON,
- index, (LPARAM)&tbb) )
- {
- wxLogLastError(wxT("TB_INSERTBUTTON"));
- }
-
- index++;
+ wxLogLastError(wxT("TB_INSERTBUTTON"));
}
- // remember the number of separators we used - we'd have to
- // delete all of them later
- ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
-
- // adjust the controls width to exactly cover the separators
- control->SetSize((nSeparators + 1)*widthSep, -1);
+ index++;
}
- // and position the control itself correctly vertically
+ // remember the number of separators we used - we'd have to
+ // delete all of them later
+ ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
+
+ // adjust the controls width to exactly cover the separators
+ control->SetSize((nSeparators + 1)*widthSep, -1);
+ }
+
+ // position the control itself correctly vertically
int height = r.bottom - r.top;
int diff = height - size.y;
if ( diff < 0 )
diff = 2;
}
- control->Move(left == -1 ? r.left : left, r.top + (diff + 1) / 2);
+ int top;
+ if ( isVertical )
+ {
+ left = 0;
+ top = y;
+
+ y += height + 2*GetMargins().y;
+ }
+ else // horizontal toolbar
+ {
+ if ( left == -1 )
+ left = r.left;
+
+ top = r.top;
+ }
+
+ control->Move(left, top + (diff + 1) / 2);
}
// the max index is the "real" number of buttons - i.e. counting even the
// this case
size_t lenAnsi = help.Len();
- #ifdef __MWERKS__
+ #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);
}
}
-static wxToolBarToolBase *GetItemSkippingDummySpacers( const wxToolBarToolsList& tools, size_t index )
+static
+wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
+ size_t index )
{
wxToolBarToolsList::Node* current = tools.GetFirst();
- for( ; current != 0; current = current->GetNext() )
+ for ( ; current != 0; current = current->GetNext() )
{
- if( index == 0 )
+ if ( index == 0 )
return current->GetData();
- size_t separators = ((wxToolBarTool*)current->GetData())->GetSeparatorsCount();
- // if it is a normal button, sepcount == 0, so skip 1
- // item ( the button )
- // otherwise, skip as many items as the separator count,
- // plus the control itself
- index -= separators ? separators + 1: 1;
+
+ wxToolBarTool *tool = (wxToolBarTool *)current->GetData();
+ size_t separators = tool->GetSeparatorsCount();
+
+ // if it is a normal button, sepcount == 0, so skip 1 item (the button)
+ // otherwise, skip as many items as the separator count, plus the
+ // control itself
+ index -= separators ? separators + 1 : 1;
}
return 0;
pt.x = x;
pt.y = y;
int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
- if ( index < 0 )
+ // MBN: when the point ( x, y ) is close to the toolbar border
+ // TB_HITTEST returns m_nButtons ( not -1 )
+ if ( index < 0 || (size_t)index >= m_nButtons )
{
// it's a separator or there is no tool at all there
return (wxToolBarToolBase *)NULL;
}
- // if comctl32 version < 4.71
- // wxToolBar95 adds dummy spacers
+ // if comctl32 version < 4.71 wxToolBar95 adds dummy spacers
#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
if ( wxTheApp->GetComCtl32Version() >= 471 )
{
return m_tools.Item((size_t)index)->GetData();
}
else
+#endif
{
return GetItemSkippingDummySpacers( m_tools, (size_t) index );
}
-#else
- return GetItemSkippingDummySpacers( m_tools, (size_t) index );
-#endif
}
void wxToolBar::UpdateSize()
// private functions
// ----------------------------------------------------------------------------
-bool wxToolBar::sm_coloursInit = FALSE;
-long wxToolBar::sm_stdColours[6];
-
-void wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
+WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
{
- if (!sm_coloursInit)
+ MemoryHDC hdcMem;
+
+ if ( !hdcMem )
+ {
+ wxLogLastError(_T("CreateCompatibleDC"));
+
+ return bitmap;
+ }
+
+ SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap);
+
+ if ( !bmpInHDC )
{
- // When a bitmap is loaded, the RGB values can change. So we need to have a
- // reference bitmap which can tell us what the RGB values change to.
- wxBitmap stdColourBitmap("wxBITMAP_STD_COLOURS", wxBITMAP_TYPE_RESOURCE);
- if (stdColourBitmap.Ok())
+ wxLogLastError(_T("SelectObject"));
+
+ return bitmap;
+ }
+
+ wxCOLORMAP *cmap = wxGetStdColourMap();
+
+ for ( int i = 0; i < width; i++ )
+ {
+ for ( int j = 0; j < height; j++ )
{
- wxMemoryDC memDC;
- memDC.SelectObject(stdColourBitmap);
+ COLORREF pixel = ::GetPixel(hdcMem, i, j);
- int i = 0;
- wxColour colour;
- for (i = 0; i < 6; i++)
+ for ( size_t k = 0; k < wxSTD_COL_MAX; k++ )
{
- memDC.GetPixel(i, 0, & colour);
- sm_stdColours[i] = RGB(colour.Red(), colour.Green(), colour.Blue());
+ 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, cmap[k].to);
+ break;
+ }
}
- sm_coloursInit = TRUE;
- memDC.SelectObject(wxNullBitmap);
- }
- else
- {
- sm_stdColours[0] = RGB(000,000,000) ;
- sm_stdColours[1] = RGB(128,128,128) ;
- sm_stdColours[2] = RGB(192,192,192) ;
- sm_stdColours[3] = RGB(255,255,255) ;
- sm_stdColours[4] = RGB(000,000,255) ;
- sm_stdColours[5] = RGB(255,000,255) ;
- sm_coloursInit = TRUE;
}
}
- HBITMAP hBitmap = (HBITMAP) bitmap;
+ return bitmap;
- COLORMAP ColorMap[5];
+ // VZ: I leave here my attempts to map the bitmap to the system colours
+ // faster by using BitBlt() even though it's broken currently - but
+ // maybe someone else can finish it? It should be faster than iterating
+ // over all pixels...
+#if 0
+ MemoryHDC hdcMask, hdcDst;
+ if ( !hdcMask || !hdcDst )
+ {
+ wxLogLastError(_T("CreateCompatibleDC"));
- ColorMap[0].from = sm_stdColours[0]; ColorMap[0].to = COLOR_BTNTEXT; // black (0, 0 0)
- ColorMap[1].from = sm_stdColours[1]; ColorMap[1].to = COLOR_BTNSHADOW; // dark grey (128, 128, 128)
- ColorMap[2].from = sm_stdColours[2]; ColorMap[2].to = COLOR_BTNFACE; // bright grey (192, 192, 192)
- ColorMap[3].from = sm_stdColours[3]; ColorMap[3].to = COLOR_BTNHIGHLIGHT; // white (255, 255, 255)
- // ColorMap[4].from = sm_stdColours[4]; ColorMap[4].to = COLOR_HIGHLIGHT; // blue (0, 0, 255)
- ColorMap[4].from = sm_stdColours[5]; ColorMap[4].to = COLOR_WINDOW; // magenta (255, 0, 255)
+ return bitmap;
+ }
- for ( size_t n = 0; n < WXSIZEOF(ColorMap); n++)
+ // create the target bitmap
+ HBITMAP hbmpDst = ::CreateCompatibleBitmap(hdcDst, width, height);
+ if ( !hbmpDst )
{
- ColorMap[n].to = ::GetSysColor(ColorMap[n].to);
- }
+ wxLogLastError(_T("CreateCompatibleBitmap"));
- HBITMAP hbmOld;
- HDC hdcMem = CreateCompatibleDC(NULL);
+ return bitmap;
+ }
- if (hdcMem)
+ // create the monochrome mask bitmap
+ HBITMAP hbmpMask = ::CreateBitmap(width, height, 1, 1, 0);
+ if ( !hbmpMask )
{
- hbmOld = (HBITMAP) SelectObject(hdcMem, hBitmap);
+ wxLogLastError(_T("CreateBitmap(mono)"));
- for ( int i = 0; i < width; i++ )
- {
- for ( int j = 0; j < height; j++ )
- {
- COLORREF pixel = ::GetPixel(hdcMem, i, j);
+ ::DeleteObject(hbmpDst);
- for ( size_t k = 0; k < WXSIZEOF(ColorMap); k++ )
- {
- int distance = abs( GetRValue( pixel ) - GetRValue( ColorMap[k].from )) ;
- distance = max( distance , abs(GetGValue(pixel ) - GetGValue( ColorMap[k].from ))) ;
- distance = max( distance , abs(GetBValue(pixel ) - GetBValue( ColorMap[k].from ))) ;
- if ( distance < 0x10 )
- {
- ::SetPixel(hdcMem, i, j, ColorMap[k].to);
- break;
- }
- }
- }
- }
+ return bitmap;
+ }
+
+ SelectInHDC bmpInDst(hdcDst, hbmpDst),
+ bmpInMask(hdcMask, hbmpMask);
+
+ // for each colour:
+ for ( n = 0; n < NUM_OF_MAPPED_COLOURS; n++ )
+ {
+ // create the mask for this colour
+ ::SetBkColor(hdcMem, ColorMap[n].from);
+ ::BitBlt(hdcMask, 0, 0, width, height, hdcMem, 0, 0, SRCCOPY);
+
+ // replace this colour with the target one in the dst bitmap
+ HBRUSH hbr = ::CreateSolidBrush(ColorMap[n].to);
+ HGDIOBJ hbrOld = ::SelectObject(hdcDst, hbr);
+ ::MaskBlt(hdcDst, 0, 0, width, height,
+ hdcMem, 0, 0,
+ hbmpMask, 0, 0,
+ MAKEROP4(PATCOPY, SRCCOPY));
- SelectObject(hdcMem, hbmOld);
- DeleteObject(hdcMem);
+ (void)::SelectObject(hdcDst, hbrOld);
+ ::DeleteObject(hbr);
}
-}
-// Some experiments...
-#if 0
-// What we want to do is create another bitmap which has a depth of 4,
-// and set the bits. So probably we want to convert this HBITMAP into a
-// DIB, then call SetDIBits.
-// AAAGH. The stupid thing is that if newBitmap has a depth of 4 (less than that of
-// the screen), then SetDIBits fails.
-HBITMAP newBitmap = ::CreateBitmap(totalBitmapWidth, totalBitmapHeight, 1, 4, NULL);
-HANDLE newDIB = ::BitmapToDIB((HBITMAP) m_hBitmap, NULL);
-LPBITMAPINFOHEADER lpbmi = (LPBITMAPINFOHEADER) GlobalLock(newDIB);
-
-dc = ::GetDC(NULL);
-// LPBITMAPINFOHEADER lpbmi = (LPBITMAPINFOHEADER) newDIB;
-
-int result = ::SetDIBits(dc, newBitmap, 0, lpbmi->biHeight, FindDIBBits((LPSTR)lpbmi), (LPBITMAPINFO)lpbmi,
- DIB_PAL_COLORS);
-DWORD err = GetLastError();
-
-::ReleaseDC(NULL, dc);
-
-// Delete the DIB
-GlobalUnlock (newDIB);
-GlobalFree (newDIB);
-
-// WXHBITMAP hBitmap2 = wxCreateMappedBitmap((WXHINSTANCE) wxGetInstance(), (WXHBITMAP) m_hBitmap);
-// Substitute our new bitmap for the old one
-::DeleteObject((HBITMAP) m_hBitmap);
-m_hBitmap = (WXHBITMAP) newBitmap;
-#endif
+ ::DeleteObject((HBITMAP)bitmap);
+ return (WXHBITMAP)hbmpDst;
+#endif // 0
+}
#endif // wxUSE_TOOLBAR && Win95
projects / wxWidgets.git / blobdiff