X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c229e50dc773306e1c2b47056ae625ca495c35ee..e3fed5c49ab00309ec63dbf05fd498e658ad81e2:/src/common/tbarbase.cpp diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index cbe5143e37..a68b275b1a 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -38,11 +38,6 @@ #include "wx/image.h" #include "wx/settings.h" -// For ::UpdateWindow -#ifdef __WXMSW__ -#include -#endif - #include "wx/tbarbase.h" // ---------------------------------------------------------------------------- @@ -79,7 +74,7 @@ bool wxToolBarToolBase::Enable(bool enable) bool wxToolBarToolBase::Toggle(bool toggle) { - wxASSERT_MSG( m_isToggle, _T("can't toggle this tool") ); + wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") ); if ( m_toggled == toggle ) return FALSE; @@ -91,10 +86,11 @@ bool wxToolBarToolBase::Toggle(bool toggle) bool wxToolBarToolBase::SetToggle(bool toggle) { - if ( m_isToggle == toggle ) + wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL; + if ( m_kind == kind ) return FALSE; - m_isToggle = toggle; + m_kind = kind; return TRUE; } @@ -137,34 +133,36 @@ wxToolBarBase::wxToolBarBase() m_maxRows = m_maxCols = 0; } -wxToolBarToolBase *wxToolBarBase::AddTool(int id, - const wxBitmap& bitmap, - const wxBitmap& pushedBitmap, - bool toggle, - wxCoord WXUNUSED(xPos), - wxCoord WXUNUSED(yPos), - wxObject *clientData, - const wxString& helpString1, - const wxString& helpString2) +wxToolBarToolBase *wxToolBarBase::DoAddTool(int id, + const wxString& label, + const wxBitmap& bitmap, + const wxBitmap& bmpDisabled, + wxItemKind kind, + const wxString& shortHelp, + const wxString& longHelp, + wxObject *clientData, + wxCoord WXUNUSED(xPos), + wxCoord WXUNUSED(yPos)) { - return InsertTool(GetToolsCount(), id, bitmap, pushedBitmap, - toggle, clientData, helpString1, helpString2); + return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled, + kind, shortHelp, longHelp, clientData); } wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos, int id, + const wxString& label, const wxBitmap& bitmap, - const wxBitmap& pushedBitmap, - bool toggle, - wxObject *clientData, - const wxString& helpString1, - const wxString& helpString2) + const wxBitmap& bmpDisabled, + wxItemKind kind, + const wxString& shortHelp, + const wxString& longHelp, + wxObject *clientData) { wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL, _T("invalid position in wxToolBar::InsertTool()") ); - wxToolBarToolBase *tool = CreateTool(id, bitmap, pushedBitmap, toggle, - clientData, helpString1, helpString2); + wxToolBarToolBase *tool = CreateTool(id, label, bitmap, bmpDisabled, kind, + clientData, shortHelp, longHelp); if ( !tool || !DoInsertTool(pos, tool) ) { @@ -219,8 +217,9 @@ wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos) _T("invalid position in wxToolBar::InsertSeparator()") ); wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR, + wxEmptyString, wxNullBitmap, wxNullBitmap, - FALSE, (wxObject *)NULL, + wxITEM_SEPARATOR, (wxObject *)NULL, wxEmptyString, wxEmptyString); if ( !tool || !DoInsertTool(pos, tool) ) @@ -510,15 +509,24 @@ void wxToolBarBase::OnMouseEnter(int id) (void)GetEventHandler()->ProcessEvent(event); - wxToolBarToolBase *tool = FindById(id); - if ( !tool || !tool->GetLongHelp() ) - return; - wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); if ( !frame ) return; - frame->SetStatusText(tool->GetLongHelp()); + wxString helpstring; + + if ( id != -1 ) + { + wxToolBarToolBase *tool = FindById(id); + if ( tool ) + helpstring = tool->GetLongHelp(); + } + + // set the status text anyhow, even if the string is empty: this ensures + // that it is cleared when the mouse leaves the toolbar or enters a tool + // without help + if (frame->GetStatusBar()) + frame->SetStatusText(helpstring); } // ---------------------------------------------------------------------------- @@ -570,99 +578,44 @@ void wxToolBarBase::DoToolbarUpdates() } } -///////////// button-label rendering helpers ////////////////// - -#define MIN_COLOR_DIFF 10 - -#define IS_IN_ARRAY(x,y) ( (x) < width && (y) < height && (x) >= 0 && (y) >= 0 ) - -#define IS_GREATER(red1,green1,blue1, red2,green2,blue2) ( ( red1 > red2 + MIN_COLOR_DIFF ) && \ - ( green1 > green2 + MIN_COLOR_DIFF ) && \ - ( blue1 > blue2 + MIN_COLOR_DIFF ) \ - ) - // Helper function, used by wxCreateGreyedImage -static void wxGreyOutImage( const wxImage& src, wxImage& dest, - const wxColour& darkCol, const wxColour& lightCol, const wxColour& bgCol) +static void wxGreyOutImage( const wxImage& src, + wxImage& dest, + const wxColour& darkCol, + const wxColour& lightCol, + const wxColour& bgCol ) { - int x = 0; - int y = 1; - + // Second attempt, just making things monochrome int width = src.GetWidth(); int height = src.GetHeight(); - unsigned int redCur, greenCur, blueCur; - - do + int redCur, greenCur, blueCur; + for ( int x = 0; x < width; x++ ) { - redCur = src.GetRed(x, y); - greenCur = src.GetGreen(x, y); - blueCur = src.GetBlue(x, y); - - if ( IS_IN_ARRAY(x-1,y-1) ) + for ( int y = 1; y < height; y++ ) { - unsigned int redUpper = src.GetRed(x-1, y-1); - unsigned int greenUpper = src.GetGreen(x-1, y-1); - unsigned int blueUpper = src.GetBlue(x-1, y-1); + redCur = src.GetRed(x, y); + greenCur = src.GetGreen(x, y); + blueCur = src.GetBlue(x, y); - // if the upper element is lighter than current - if ( IS_GREATER(redUpper, greenUpper, blueUpper, redCur, greenCur, blueCur) ) + // Change light things to the background colour + if ( redCur >= (lightCol.Red() - 50) && greenCur >= (lightCol.Green() - 50) && blueCur >= (lightCol.Blue() - 50) ) { - dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue()); - } - // if the current element is ligher than the upper - else if ( IS_GREATER(redCur, greenCur, blueCur, redUpper, greenUpper, blueUpper) ) - { - dest.SetRGB(x,y, lightCol.Red(), lightCol.Green(), lightCol.Blue()); + dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue()); } - else + else if ( redCur == bgCol.Red() && greenCur == bgCol.Green() && blueCur == bgCol.Blue() ) { - unsigned int red1 = dest.GetRed(x-1, y-1); - unsigned int green1 = dest.GetGreen(x-1, y-1); - unsigned int blue1 = dest.GetBlue(x-1, y-1); - - if ( red1 == lightCol.Red() && green1 == lightCol.Green() && blue1 == lightCol.Blue() ) - dest.SetRGB(x, y, bgCol.Red(), bgCol.Green(), bgCol.Blue()); - else if ( red1 == darkCol.Red() && green1 == darkCol.Green() && blue1 == darkCol.Blue() ) - dest.SetRGB(x, y, darkCol.Red(), darkCol.Green(), darkCol.Blue()); - else - dest.SetRGB(x, y, bgCol.Red(), bgCol.Green(), bgCol.Blue()); + // Leave the background colour as-is + // dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue()); } - } - - // go zig-zag - - if ( IS_IN_ARRAY(x+1,y-1) ) - { - ++x; - --y; - } - else - { - while ( IS_IN_ARRAY(x-1,y+1) ) + else // if ( redCur <= darkCol.Red() && greenCur <= darkCol.Green() && blueCur <= darkCol.Blue() ) { - --x; - ++y; - } - - if ( IS_IN_ARRAY(x,y+1) ) - { - ++y; - continue; - } - else - { - if ( IS_IN_ARRAY(x+1,y) ) - { - ++x; - continue; - } - else break; + // Change dark things to really dark + dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue()); } } - - } while (1); + } } /*