// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "tbarbase.h"
#endif
#include "wx/image.h"
#include "wx/settings.h"
-#include "wx/tbarbase.h"
+#include "wx/toolbar.h"
// ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
// ----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxToolBarBase, wxControl)
-
BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
- EVT_IDLE(wxToolBarBase::OnIdle)
END_EVENT_TABLE()
#include "wx/listimpl.cpp"
// 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;
}
wxToolBarToolBase::~wxToolBarToolBase()
wxToolBarBase::wxToolBarBase()
{
// the list owns the pointers
- m_tools.DeleteContents(TRUE);
-
m_xMargin = m_yMargin = 0;
m_maxRows = m_maxCols = 0;
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);
}
// ----------------------------------------------------------------------------
{
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();
}
// 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);
+ wxToolBarToolBase* tool = id == wxID_ANY ? (wxToolBarToolBase*)0 : FindById(id);
wxString help = tool ? tool->GetLongHelp() : wxString();
- frame->DoGiveHelp( help, id != -1 );
+ frame->DoGiveHelp( help, id != wxID_ANY );
}
(void)GetEventHandler()->ProcessEvent(event);
// UI updates
// ----------------------------------------------------------------------------
-void wxToolBarBase::OnIdle(wxIdleEvent& event)
-{
- DoToolbarUpdates();
-
- event.Skip();
-}
-
// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
-void wxToolBarBase::DoToolbarUpdates()
+void wxToolBarBase::UpdateWindowUI(long flags)
{
- wxWindow* parent = this;
- while (parent->GetParent())
- parent = parent->GetParent();
+ wxWindowBase::UpdateWindowUI(flags);
-// This kind of #ifdef is a good way to annoy people. It breaks
-// apps, but only on one platform and due to a hack in officially
-// platform independent code. It took me hours to fix this. RR.
-//
-// #ifdef __WXMSW__
-// wxWindow* focusWin = wxFindFocusDescendant(parent);
-// #else
- wxWindow* focusWin = (wxWindow*) NULL;
-// #endif
+ // 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 = focusWin ? focusWin->GetEventHandler() : GetEventHandler() ;
+ wxEvtHandler* evtHandler = GetEventHandler() ;
- for ( wxToolBarToolsList::Node* node = m_tools.GetFirst();
+ for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
{
wxGreyOutImage(in, out, darkCol, lightCol, bgCol);
- return TRUE;
+ return true;
}
#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff