/////////////////////////////////////////////////////////////////////////////
-// 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
// 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"
#if wxUSE_TOOLBAR
+#include "wx/toolbar.h"
+
#ifndef WX_PRECOMP
#include "wx/control.h"
+ #include "wx/frame.h"
+ #include "wx/settings.h"
+ #if WXWIN_COMPATIBILITY_2_8
+ #include "wx/image.h"
+ #endif // WXWIN_COMPATIBILITY_2_8
#endif
-#include "wx/frame.h"
-#include "wx/image.h"
-#include "wx/settings.h"
-
-#include "wx/toolbar.h"
-
// ----------------------------------------------------------------------------
// wxWidgets macros
// ----------------------------------------------------------------------------
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxToolBarToolsList);
+WX_DEFINE_LIST(wxToolBarToolsList)
// ============================================================================
// implementation
{
// 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;
+}
+
+void wxToolBarBase::FixupStyle()
+{
+ if ( !HasFlag(wxTB_TOP | wxTB_LEFT | wxTB_RIGHT | wxTB_BOTTOM) )
+ {
+ // this is the default
+ m_windowStyle |= wxTB_TOP;
+ }
}
wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
return tool;
}
-wxToolBarToolBase *wxToolBarBase::AddControl(wxControl *control)
+wxToolBarToolBase *
+wxToolBarBase::AddControl(wxControl *control, const wxString& label)
{
- return InsertControl(GetToolsCount(), control);
+ return InsertControl(GetToolsCount(), control, label);
}
-wxToolBarToolBase *wxToolBarBase::InsertControl(size_t pos, wxControl *control)
+wxToolBarToolBase *
+wxToolBarBase::InsertControl(size_t pos,
+ wxControl *control,
+ const wxString& label)
{
wxCHECK_MSG( control, (wxToolBarToolBase *)NULL,
_T("toolbar: can't insert NULL control") );
wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
_T("invalid position in wxToolBar::InsertControl()") );
- wxToolBarToolBase *tool = CreateTool(control);
+ wxToolBarToolBase *tool = CreateTool(control, label);
if ( !InsertTool(pos, 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;
- if ( tool->Toggle(false) )
+ if ( toolNext->Toggle(false) )
{
- DoToggleTool(tool, false);
+ DoToggleTool(toolNext, false);
}
nodeNext = nodeNext->GetNext();
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;
- if ( tool->Toggle(false) )
+ if ( toolNext->Toggle(false) )
{
- DoToggleTool(tool, false);
+ DoToggleTool(toolNext, false);
}
nodePrev = nodePrev->GetPrevious();
void wxToolBarBase::ClearTools()
{
- WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
+ while ( GetToolsCount() )
+ {
+ DeleteToolByPos(0);
+ }
}
bool wxToolBarBase::Realize()
// notify the frame that it doesn't have a tool bar any longer to avoid
// dangling pointers
- wxFrameBase *frame = wxDynamicCast(GetParent(), wxFrameBase);
+ wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
if ( frame && frame->GetToolBar() == this )
{
frame->SetToolBar(NULL);
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();
}
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();
}
{
wxWindowBase::UpdateWindowUI(flags);
+ // don't waste time updating state of tools in a hidden toolbar
+ if ( !IsShown() )
+ return;
+
// There is no sense in updating the toolbar UI
// if the parent window is about to get destroyed
wxWindow *tlw = wxGetTopLevelParent( this );
}
}
-// Helper function, used by wxCreateGreyedImage
-
-static void wxGreyOutImage( const wxImage& src,
- wxImage& dest,
- const wxColour& darkCol,
- const wxColour& lightCol,
- const wxColour& bgCol )
-{
- // Second attempt, just making things monochrome
- int width = src.GetWidth();
- int height = src.GetHeight();
-
- int redCur, greenCur, blueCur;
- for ( int x = 0; x < width; x++ )
- {
- for ( int y = 1; y < height; y++ )
- {
- redCur = src.GetRed(x, y);
- greenCur = src.GetGreen(x, y);
- blueCur = src.GetBlue(x, y);
-
- // Change light things to the background colour
- if ( redCur >= (lightCol.Red() - 50) && greenCur >= (lightCol.Green() - 50) && blueCur >= (lightCol.Blue() - 50) )
- {
- dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
- }
- else if ( redCur == bgCol.Red() && greenCur == bgCol.Green() && blueCur == bgCol.Blue() )
- {
- // Leave the background colour as-is
- // dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
- }
- else // if ( redCur <= darkCol.Red() && greenCur <= darkCol.Green() && blueCur <= darkCol.Blue() )
- {
- // Change dark things to really dark
- dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue());
- }
- }
- }
-}
-
-/*
- * Make a greyed-out image suitable for disabled buttons.
- * This code is adapted from wxNewBitmapButton in FL.
- */
+#if WXWIN_COMPATIBILITY_2_8
bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
{
- out = in.Copy();
+#if wxUSE_IMAGE
+ out = in.ConvertToGreyscale();
+ if ( out.Ok() )
+ return true;
+#endif // wxUSE_IMAGE
- // 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;
+ return false;
}
+#endif // WXWIN_COMPATIBILITY_2_8
+
#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff