// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "tbarbase.h"
#endif
#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"
// ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
// ----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxToolBarBase, wxControl)
-
BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
END_EVENT_TABLE()
// wxToolBarToolBase
// ----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)
+
bool wxToolBarToolBase::Enable(bool enable)
{
if ( m_enabled == enable )
- return FALSE;
+ return false;
m_enabled = enable;
- return TRUE;
+ return true;
}
bool wxToolBarToolBase::Toggle(bool toggle)
wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );
if ( m_toggled == toggle )
- return FALSE;
+ return false;
m_toggled = toggle;
- return TRUE;
+ return true;
}
bool wxToolBarToolBase::SetToggle(bool toggle)
{
wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;
if ( m_kind == kind )
- return FALSE;
+ return false;
m_kind = kind;
- return TRUE;
+ return true;
}
bool wxToolBarToolBase::SetShortHelp(const wxString& help)
{
if ( m_shortHelpString == help )
- return FALSE;
+ return false;
m_shortHelpString = help;
- return TRUE;
+ return true;
}
bool wxToolBarToolBase::SetLongHelp(const wxString& help)
{
if ( m_longHelpString == help )
- return FALSE;
+ return false;
m_longHelpString = help;
- return TRUE;
+ return true;
+}
+
+#if WXWIN_COMPATIBILITY_2_2
+
+const wxBitmap& wxToolBarToolBase::GetBitmap1() const
+{
+ return GetNormalBitmap();
+}
+
+const wxBitmap& wxToolBarToolBase::GetBitmap2() const
+{
+ return GetDisabledBitmap();
}
-wxToolBarToolBase::~wxToolBarToolBase()
+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
// ----------------------------------------------------------------------------
wxToolBarBase::wxToolBarBase()
{
// the list owns the pointers
- m_tools.DeleteContents(TRUE);
-
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,
wxCoord WXUNUSED(xPos),
wxCoord WXUNUSED(yPos))
{
+ InvalidateBestSize();
return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled,
kind, shortHelp, longHelp, clientData);
}
wxControl *wxToolBarBase::FindControl( int id )
{
- for ( wxToolBarToolsList::Node* node = m_tools.GetFirst();
+ for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
{
wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
{
size_t pos = 0;
- wxToolBarToolsList::Node *node;
+ wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
if ( node->GetData()->GetId() == id )
return (wxToolBarToolBase *)NULL;
}
- // the node would delete the data, so set it to NULL to avoid this
- node->SetData(NULL);
-
- m_tools.DeleteNode(node);
+ m_tools.Erase(node);
return tool;
}
bool wxToolBarBase::DeleteToolByPos(size_t pos)
{
- wxCHECK_MSG( pos < GetToolsCount(), FALSE,
+ wxCHECK_MSG( pos < GetToolsCount(), false,
_T("invalid position in wxToolBar::DeleteToolByPos()") );
- wxToolBarToolsList::Node *node = m_tools.Item(pos);
+ wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos);
if ( !DoDeleteTool(pos, node->GetData()) )
{
- return FALSE;
+ return false;
}
- m_tools.DeleteNode(node);
+ delete node->GetData();
+ m_tools.Erase(node);
- return TRUE;
+ return true;
}
bool wxToolBarBase::DeleteTool(int id)
{
size_t pos = 0;
- wxToolBarToolsList::Node *node;
+ wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
if ( node->GetData()->GetId() == id )
if ( !node || !DoDeleteTool(pos, node->GetData()) )
{
- return FALSE;
+ return false;
}
- m_tools.DeleteNode(node);
+ delete node->GetData();
+ m_tools.Erase(node);
- return TRUE;
+ return true;
}
wxToolBarToolBase *wxToolBarBase::FindById(int id) const
{
wxToolBarToolBase *tool = (wxToolBarToolBase *)NULL;
- for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
+ for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
{
return tool;
}
+void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
+{
+ wxCHECK_RET( tool, _T("NULL tool in wxToolBarTool::UnToggleRadioGroup") );
+
+ if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+ return;
+
+ wxToolBarToolsList::compatibility_iterator node = m_tools.Find(tool);
+ wxCHECK_RET( node, _T("invalid tool in wxToolBarTool::UnToggleRadioGroup") );
+
+ wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
+ while ( nodeNext )
+ {
+ wxToolBarToolBase *tool = nodeNext->GetData();
+
+ if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+ break;
+
+ if ( tool->Toggle(false) )
+ {
+ DoToggleTool(tool, false);
+ }
+
+ nodeNext = nodeNext->GetNext();
+ }
+
+ wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+ while ( nodePrev )
+ {
+ wxToolBarToolBase *tool = nodePrev->GetData();
+
+ if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+ break;
+
+ if ( tool->Toggle(false) )
+ {
+ DoToggleTool(tool, false);
+ }
+
+ nodePrev = nodePrev->GetPrevious();
+ }
+}
+
void wxToolBarBase::ClearTools()
{
- m_tools.Clear();
+ WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
}
bool wxToolBarBase::Realize()
{
- return TRUE;
+ return true;
}
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
+ wxFrameBase *frame = wxDynamicCast(GetParent(), wxFrameBase);
+ if ( frame && frame->GetToolBar() == this )
+ {
+ frame->SetToolBar(NULL);
+ }
}
// ----------------------------------------------------------------------------
{
if ( tool->Toggle(toggle) )
{
+ UnToggleRadioGroup(tool);
DoToggleTool(tool, toggle);
}
}
int wxToolBarBase::GetToolPos(int id) const
{
size_t pos = 0;
- wxToolBarToolsList::Node *node;
+ wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
bool wxToolBarBase::GetToolState(int id) const
{
wxToolBarToolBase *tool = FindById(id);
- wxCHECK_MSG( tool, FALSE, _T("no such tool") );
+ wxCHECK_MSG( tool, false, _T("no such tool") );
return tool->IsToggled();
}
bool wxToolBarBase::GetToolEnabled(int id) const
{
wxToolBarToolBase *tool = FindById(id);
- wxCHECK_MSG( tool, FALSE, _T("no such tool") );
+ wxCHECK_MSG( tool, false, _T("no such tool") );
return tool->IsEnabled();
}
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();
}
// event processing
// ----------------------------------------------------------------------------
-// Only allow toggle if returns TRUE
+// Only allow toggle if returns true
bool wxToolBarBase::OnLeftClick(int id, bool toggleDown)
{
wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, id);
// Send events to this toolbar instead (and thence up the window hierarchy)
GetEventHandler()->ProcessEvent(event);
- return TRUE;
+ return true;
}
// Call when right button down.
}
// 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.
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);
{
wxWindowBase::UpdateWindowUI(flags);
+ // There is no sense in updating the toolbar UI
+ // if the parent window is about to get destroyed
+ wxWindow *tlw = wxGetTopLevelParent( this );
+ if (tlw && wxPendingDelete.Member( tlw ))
+ return;
+
wxEvtHandler* evtHandler = GetEventHandler() ;
- for ( wxToolBarToolsList::Node* node = m_tools.GetFirst();
+ for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
{
}
}
-// Helper function, used by wxCreateGreyedImage
+#if wxUSE_IMAGE
-static void wxGreyOutImage( const wxImage& src,
- wxImage& dest,
- const wxColour& darkCol,
- const wxColour& lightCol,
- const wxColour& bgCol )
+/*
+ * Make a greyed-out image suitable for disabled buttons.
+ * This code is adapted from wxNewBitmapButton in FL.
+ */
+
+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;
+ return true;
}
+#endif // wxUSE_IMAGE
+
#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff