// Name: 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"
#endif
#include "wx/frame.h"
-#include "wx/image.h"
-#include "wx/settings.h"
+
+#if wxUSE_IMAGE
+ #include "wx/image.h"
+ #include "wx/settings.h"
+#endif // wxUSE_IMAGE
#include "wx/toolbar.h"
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxToolBarToolsList);
+WX_DEFINE_LIST(wxToolBarToolsList)
// ============================================================================
// implementation
return true;
}
-#if WXWIN_COMPATIBILITY_2_2
-
-const wxBitmap& wxToolBarToolBase::GetBitmap1() const
-{
- return GetNormalBitmap();
-}
-
-const wxBitmap& wxToolBarToolBase::GetBitmap2() const
-{
- return GetDisabledBitmap();
-}
-
-void wxToolBarToolBase::SetBitmap1(const wxBitmap& bmp)
-{
- SetNormalBitmap(bmp);
-}
-
-void wxToolBarToolBase::SetBitmap2(const wxBitmap& bmp)
-{
- SetDisabledBitmap(bmp);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-
// ----------------------------------------------------------------------------
// wxToolBarBase adding/deleting items
// ----------------------------------------------------------------------------
{
// 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,
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);
}
}
-// 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
projects / wxWidgets.git / blobdiff