#ifndef __TWIN32__
-#ifdef __GNUWIN32_OLD__
- #include "wx/msw/gnuwin32/extra.h"
-#else
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
#include <commctrl.h>
+#else
+ #include "wx/msw/gnuwin32/extra.h"
#endif
#endif // __TWIN32__
#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
// ----------------------------------------------------------------------------
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;
#ifdef TBSTYLE_TOOLTIPS
msflags |= TBSTYLE_TOOLTIPS;
{
// we must refresh the frame size when the toolbar is deleted but the frame
// is not - otherwise toolbar leaves a hole in the place it used to occupy
- //
- // NB: a frame is being deleted only if it is not any longer in
- // wxTopLevelWindows list
wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
- if ( frame && wxTopLevelWindows.Find(frame) )
+ if ( frame && !frame->IsBeingDeleted() )
{
frame->SendSizeEvent();
}
if ( tool2->IsControl() )
{
- pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount();
+ pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
}
}
{
if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
{
- wxLogLastError(wxT("TB_DELETEBUTTON"));
+ wxLogDebug(wxT("TB_DELETEBUTTON failed"));
}
}
// ------------------------------
// 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
// message handlers
// ----------------------------------------------------------------------------
-bool wxToolBar::MSWCommand(WXUINT cmd, WXWORD id)
+bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
{
wxToolBarToolBase *tool = FindById((int)id);
if ( !tool )
bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
WXLPARAM lParam,
- WXLPARAM *result)
+ WXLPARAM *WXUNUSED(result))
{
// First check if this applies to us
NMHDR *hdr = (NMHDR *)lParam;
ttText->lpszText = (wxChar *)help.c_str();
#else
// VZ: I don't know why it happens, but the versions of
- // comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW
+ // 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
}
}
- // For backward compatibility...
- OnMouseEnter(tool->GetId());
-
return TRUE;
}
wxSize wxToolBar::GetToolSize() const
{
// TB_GETBUTTONSIZE is supported from version 4.70
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 )
+#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
+ && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
if ( wxTheApp->GetComCtl32Version() >= 470 )
{
DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
}
}
+static
+wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
+ size_t index )
+{
+ wxToolBarToolsList::Node* current = tools.GetFirst();
+
+ for ( ; current != 0; current = current->GetNext() )
+ {
+ if ( index == 0 )
+ return current->GetData();
+
+ 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;
+}
+
wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
{
POINT pt;
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;
}
- return m_tools.Item((size_t)index)->GetData();
+ // 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 );
+ }
}
void wxToolBar::UpdateSize()
(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
// Responds to colour changes, and passes event on to children.
void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
+ wxRGBToColour(m_backgroundColour, ::GetSysColor(COLOR_BTNFACE));
// Remap the buttons
Realize();
+ // Relayout the toolbar
+ int nrows = m_maxRows;
+ m_maxRows = 0; // otherwise SetRows() wouldn't do anything
+ SetRows(nrows);
+
Refresh();
- // Propagate the event to the non-top-level children
- wxWindow::OnSysColourChanged(event);
+ // let the event propagate further
+ event.Skip();
}
void wxToolBar::OnMouseEvent(wxMouseEvent& event)
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 )
+ {
+ m_pInTool = tool;
+ OnMouseEnter( tool->GetId() );
+ }
+
+ // we don't handle mouse moves, so fall through
+ // to wxControl::MSWWindowProc
+ }
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
}
// private functions
// ----------------------------------------------------------------------------
-// These are the default colors used to map the bitmap colors to the current
-// system colors. Note that they are in BGR format because this is what Windows
-// wants (and not RGB)
-
-/*
-#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
-#define BGR_BUTTONHILIGHT (RGB(255,255,255)) // white
-#define BGR_BACKGROUNDSEL (RGB(000,000,255)) // blue
-#define BGR_BACKGROUND (RGB(255,000,255)) // magenta
-*/
-
bool wxToolBar::sm_coloursInit = FALSE;
long wxToolBar::sm_stdColours[6];
sm_coloursInit = TRUE;
}
}
-
+
HBITMAP hBitmap = (HBITMAP) bitmap;
-
+
COLORMAP ColorMap[5];
-
+
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)
-
-#if 0
- {
- {BGR_BUTTONTEXT, COLOR_BTNTEXT}, // black
- {BGR_BUTTONSHADOW, COLOR_BTNSHADOW}, // dark grey
- {BGR_BUTTONFACE, COLOR_BTNFACE}, // bright grey
- {BGR_BUTTONHILIGHT, COLOR_BTNHIGHLIGHT},// white
- /* {BGR_BACKGROUNDSEL, COLOR_HIGHLIGHT}, // blue */
- {BGR_BACKGROUND, COLOR_WINDOW} // magenta
- };
-#endif
-
- int NUM_MAPS = (sizeof(ColorMap)/sizeof(COLORMAP));
- int n;
- for ( n = 0; n < NUM_MAPS; n++)
+
+ for ( size_t n = 0; n < WXSIZEOF(ColorMap); n++)
{
ColorMap[n].to = ::GetSysColor(ColorMap[n].to);
}
-
+
HBITMAP hbmOld;
HDC hdcMem = CreateCompatibleDC(NULL);
-
+
if (hdcMem)
{
hbmOld = (HBITMAP) SelectObject(hdcMem, hBitmap);
-
- int i, j, k;
- for ( i = 0; i < width; i++)
+
+ for ( int i = 0; i < width; i++ )
{
- for ( j = 0; j < height; j++)
+ for ( int j = 0; j < height; j++ )
{
COLORREF pixel = ::GetPixel(hdcMem, i, j);
- /*
- BYTE red = GetRValue(pixel);
- BYTE green = GetGValue(pixel);
- BYTE blue = GetBValue(pixel);
- */
-
- for ( k = 0; k < NUM_MAPS; k ++)
+
+ for ( size_t k = 0; k < WXSIZEOF(ColorMap); k++ )
{
- if ( ColorMap[k].from == pixel )
+ 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 )
{
- /* COLORREF actualPixel = */ ::SetPixel(hdcMem, i, j, ColorMap[k].to);
+ ::SetPixel(hdcMem, i, j, ColorMap[k].to);
break;
}
}
}
}
-
-
+
+
SelectObject(hdcMem, hbmOld);
DeleteObject(hdcMem);
}
-
}
// Some experiments...
#endif // wxUSE_TOOLBAR && Win95
+
projects / wxWidgets.git / blobdiff