X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe5d86ed04a964e2bbcddae1be7e496b244981dd..34eeb223b428c2e9ec90d88348e7e62dfeb1cb65:/src/common/tbarbase.cpp diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index d78bcf6fe8..7814a7b4ae 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -1,8 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/tbarbase.cpp +// Name: src/common/tbarbase.cpp // Purpose: wxToolBarBase implementation // Author: Julian Smart -// Modified by: VZ at 11.12.99 (wxScrollableToolBar splitted off) +// Modified by: VZ at 11.12.99 (wxScrollableToolBar split off) // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "tbarbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,18 +26,17 @@ #if wxUSE_TOOLBAR +#include "wx/toolbar.h" + #ifndef WX_PRECOMP #include "wx/control.h" + #include "wx/frame.h" + #include "wx/settings.h" + #include "wx/image.h" #endif -#include "wx/frame.h" -#include "wx/image.h" -#include "wx/settings.h" - -#include "wx/toolbar.h" - // ---------------------------------------------------------------------------- -// wxWindows macros +// wxWidgets macros // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxToolBarBase, wxControl) @@ -49,7 +44,7 @@ END_EVENT_TABLE() #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxToolBarToolsList); +WX_DEFINE_LIST(wxToolBarToolsList) // ============================================================================ // implementation @@ -59,7 +54,7 @@ WX_DEFINE_LIST(wxToolBarToolsList); // wxToolBarToolBase // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject) bool wxToolBarToolBase::Enable(bool enable) { @@ -114,10 +109,6 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help) return true; } -wxToolBarToolBase::~wxToolBarToolBase() -{ -} - // ---------------------------------------------------------------------------- // wxToolBarBase adding/deleting items // ---------------------------------------------------------------------------- @@ -126,8 +117,10 @@ wxToolBarBase::wxToolBarBase() { // the list owns the pointers m_xMargin = m_yMargin = 0; - m_maxRows = m_maxCols = 0; + m_toolPacking = m_toolSeparation = 0; + m_defaultWidth = 16; + m_defaultHeight = 15; } wxToolBarToolBase *wxToolBarBase::DoAddTool(int id, @@ -141,6 +134,7 @@ wxToolBarToolBase *wxToolBarBase::DoAddTool(int id, wxCoord WXUNUSED(xPos), wxCoord WXUNUSED(yPos)) { + InvalidateBestSize(); return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled, kind, shortHelp, longHelp, clientData); } @@ -379,12 +373,15 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool) wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext(); while ( nodeNext ) { - wxToolBarToolBase *tool = nodeNext->GetData(); + wxToolBarToolBase *toolNext = nodeNext->GetData(); - if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO ) + if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO ) break; - tool->Toggle(false); + if ( toolNext->Toggle(false) ) + { + DoToggleTool(toolNext, false); + } nodeNext = nodeNext->GetNext(); } @@ -392,12 +389,15 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool) wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious(); while ( nodePrev ) { - wxToolBarToolBase *tool = nodePrev->GetData(); + wxToolBarToolBase *toolNext = nodePrev->GetData(); - if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO ) + if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO ) break; - tool->Toggle(false); + if ( toolNext->Toggle(false) ) + { + DoToggleTool(toolNext, false); + } nodePrev = nodePrev->GetPrevious(); } @@ -405,7 +405,10 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool) void wxToolBarBase::ClearTools() { - WX_CLEAR_LIST(wxToolBarToolsList, m_tools); + while ( GetToolsCount() ) + { + DeleteToolByPos(0); + } } bool wxToolBarBase::Realize() @@ -416,6 +419,14 @@ bool wxToolBarBase::Realize() wxToolBarBase::~wxToolBarBase() { WX_CLEAR_LIST(wxToolBarToolsList, m_tools); + + // notify the frame that it doesn't have a tool bar any longer to avoid + // dangling pointers + wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); + if ( frame && frame->GetToolBar() == this ) + { + frame->SetToolBar(NULL); + } } // ---------------------------------------------------------------------------- @@ -528,7 +539,7 @@ bool wxToolBarBase::GetToolEnabled(int id) const wxString wxToolBarBase::GetToolShortHelp(int id) const { wxToolBarToolBase *tool = FindById(id); - wxCHECK_MSG( tool, _T(""), _T("no such tool") ); + wxCHECK_MSG( tool, wxEmptyString, _T("no such tool") ); return tool->GetShortHelp(); } @@ -536,7 +547,7 @@ wxString wxToolBarBase::GetToolShortHelp(int id) const wxString wxToolBarBase::GetToolLongHelp(int id) const { wxToolBarToolBase *tool = FindById(id); - wxCHECK_MSG( tool, _T(""), _T("no such tool") ); + wxCHECK_MSG( tool, wxEmptyString, _T("no such tool") ); return tool->GetLongHelp(); } @@ -591,7 +602,7 @@ void wxToolBarBase::OnRightClick(int id, } // Called when the mouse cursor enters a tool bitmap (no button pressed). -// Argument is -1 if mouse is exiting the toolbar. +// Argument is wxID_ANY if mouse is exiting the toolbar. // Note that for this event, the id of the window is used, // and the integer parameter of wxCommandEvent is used to retrieve // the tool id. @@ -604,9 +615,11 @@ void wxToolBarBase::OnMouseEnter(int id) wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); if( frame ) { - wxToolBarToolBase* tool = id == -1 ? (wxToolBarToolBase*)0 : FindById(id); - wxString help = tool ? tool->GetLongHelp() : wxString(); - frame->DoGiveHelp( help, id != -1 ); + wxString help; + wxToolBarToolBase* tool = id == wxID_ANY ? (wxToolBarToolBase*)NULL : FindById(id); + if(tool) + help = tool->GetLongHelp(); + frame->DoGiveHelp( help, id != wxID_ANY ); } (void)GetEventHandler()->ProcessEvent(event); @@ -623,7 +636,8 @@ void wxToolBarBase::UpdateWindowUI(long flags) // There is no sense in updating the toolbar UI // if the parent window is about to get destroyed - if (GetParent() && wxPendingDelete.Member( GetParent() )) + wxWindow *tlw = wxGetTopLevelParent( this ); + if (tlw && wxPendingDelete.Member( tlw )) return; wxEvtHandler* evtHandler = GetEventHandler() ; @@ -651,64 +665,73 @@ void wxToolBarBase::UpdateWindowUI(long flags) } } -// Helper function, used by wxCreateGreyedImage +#if wxUSE_IMAGE + +/* + * Make a greyed-out image suitable for disabled buttons. + * This code is adapted from wxNewBitmapButton in FL. + */ -static void wxGreyOutImage( const wxImage& src, - wxImage& dest, - const wxColour& darkCol, - const wxColour& lightCol, - const wxColour& bgCol ) +bool wxCreateGreyedImage(const wxImage& src, wxImage& dst) { + dst = src.Copy(); + + unsigned char rBg, gBg, bBg; + if ( src.HasMask() ) + { + src.GetOrFindMaskColour(&rBg, &gBg, &bBg); + dst.SetMaskColour(rBg, gBg, bBg); + } + else // assuming the pixels along the edges are of the background color + { + rBg = src.GetRed(0, 0); + gBg = src.GetGreen(0, 0); + bBg = src.GetBlue(0, 0); + } + + const wxColour colBg(rBg, gBg, bBg); + + const wxColour colDark = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW); + const wxColour colLight = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT); + // Second attempt, just making things monochrome - int width = src.GetWidth(); - int height = src.GetHeight(); + const int width = src.GetWidth(); + const int height = src.GetHeight(); - int redCur, greenCur, blueCur; for ( int x = 0; x < width; x++ ) { - for ( int y = 1; y < height; y++ ) + for ( int y = 0; y < height; y++ ) { - redCur = src.GetRed(x, y); - greenCur = src.GetGreen(x, y); - blueCur = src.GetBlue(x, y); + const int r = src.GetRed(x, y); + const int g = src.GetGreen(x, y); + const int b = src.GetBlue(x, y); - // Change light things to the background colour - if ( redCur >= (lightCol.Red() - 50) && greenCur >= (lightCol.Green() - 50) && blueCur >= (lightCol.Blue() - 50) ) + if ( r == rBg && g == gBg && b == bBg ) { - dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue()); + // Leave the background colour as-is + continue; } - else if ( redCur == bgCol.Red() && greenCur == bgCol.Green() && blueCur == bgCol.Blue() ) + + // Change light things to the background colour + wxColour col; + if ( r >= (colLight.Red() - 50) && + g >= (colLight.Green() - 50) && + b >= (colLight.Blue() - 50) ) { - // Leave the background colour as-is - // dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue()); + col = colBg; } - else // if ( redCur <= darkCol.Red() && greenCur <= darkCol.Green() && blueCur <= darkCol.Blue() ) + else // Change dark things to really dark { - // Change dark things to really dark - dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue()); + col = colDark; } + + dst.SetRGB(x, y, col.Red(), col.Green(), col.Blue()); } } -} - -/* - * Make a greyed-out image suitable for disabled buttons. - * This code is adapted from wxNewBitmapButton in FL. - */ - -bool wxCreateGreyedImage(const wxImage& in, wxImage& out) -{ - out = in.Copy(); - - // assuming the pixels along the edges are of the background color - wxColour bgCol(in.GetRed(0, 0), in.GetGreen(0, 0), in.GetBlue(0, 0)); - - wxColour darkCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ; - wxColour lightCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT) ; - - wxGreyOutImage(in, out, darkCol, lightCol, bgCol); return true; } +#endif // wxUSE_IMAGE + #endif // wxUSE_TOOLBAR