wxUSE_LOG fixes.

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 1438c9f3c6e6c5b215fb7f1e22a1d2ad82efcda1..2496b8a9749f95617a530d51c375fd42025ffa78 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -41,7 +41,7 @@
 #include "wx/toolbar.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/toolbar.h"
 
 // ----------------------------------------------------------------------------

-// wxWindows macros
+// wxWidgets macros

 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)


@@ -59,14 +59,16 @@ WX_DEFINE_LIST(wxToolBarToolsList);
 // wxToolBarToolBase
 // ----------------------------------------------------------------------------
 
 // wxToolBarToolBase
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)   
+

 bool wxToolBarToolBase::Enable(bool enable)
 {
     if ( m_enabled == enable )
 bool wxToolBarToolBase::Enable(bool enable)
 {
     if ( m_enabled == enable )

-        return FALSE;
+        return false;

 
     m_enabled = enable;
 
 
     m_enabled = enable;
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBarToolBase::Toggle(bool toggle)
 }
 
 bool wxToolBarToolBase::Toggle(bool toggle)


@@ -74,42 +76,42 @@ bool wxToolBarToolBase::Toggle(bool toggle)
     wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );
 
     if ( m_toggled == toggle )
     wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );
 
     if ( m_toggled == toggle )

-        return FALSE;
+        return false;

 
     m_toggled = toggle;
 
 
     m_toggled = toggle;
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBarToolBase::SetToggle(bool toggle)
 {
     wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;
     if ( m_kind == kind )
 }
 
 bool wxToolBarToolBase::SetToggle(bool toggle)
 {
     wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;
     if ( m_kind == kind )

-        return FALSE;
+        return false;

 
     m_kind = kind;
 
 
     m_kind = kind;
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBarToolBase::SetShortHelp(const wxString& help)
 {
     if ( m_shortHelpString == help )
 }
 
 bool wxToolBarToolBase::SetShortHelp(const wxString& help)
 {
     if ( m_shortHelpString == help )

-        return FALSE;
+        return false;

 
     m_shortHelpString = help;
 
 
     m_shortHelpString = help;
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBarToolBase::SetLongHelp(const wxString& help)
 {
     if ( m_longHelpString == help )
 }
 
 bool wxToolBarToolBase::SetLongHelp(const wxString& help)
 {
     if ( m_longHelpString == help )

-        return FALSE;
+        return false;

 
     m_longHelpString = help;
 
 
     m_longHelpString = help;
 

-    return TRUE;
+    return true;

 }
 
 wxToolBarToolBase::~wxToolBarToolBase()
 }
 
 wxToolBarToolBase::~wxToolBarToolBase()


@@ -139,6 +141,7 @@ wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
                                             wxCoord WXUNUSED(xPos),
                                             wxCoord WXUNUSED(yPos))
 {
                                             wxCoord WXUNUSED(xPos),
                                             wxCoord WXUNUSED(yPos))
 {

+    InvalidateBestSize();

     return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled,
                       kind, shortHelp, longHelp, clientData);
 }
     return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled,
                       kind, shortHelp, longHelp, clientData);
 }


@@ -304,20 +307,20 @@ wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
 
 bool wxToolBarBase::DeleteToolByPos(size_t pos)
 {
 
 bool wxToolBarBase::DeleteToolByPos(size_t pos)
 {

-    wxCHECK_MSG( pos < GetToolsCount(), FALSE,
+    wxCHECK_MSG( pos < GetToolsCount(), false,

                  _T("invalid position in wxToolBar::DeleteToolByPos()") );
 
     wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos);
 
     if ( !DoDeleteTool(pos, node->GetData()) )
     {
                  _T("invalid position in wxToolBar::DeleteToolByPos()") );
 
     wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos);
 
     if ( !DoDeleteTool(pos, node->GetData()) )
     {

-        return FALSE;
+        return false;

     }
 
     delete node->GetData();
     m_tools.Erase(node);
 
     }
 
     delete node->GetData();
     m_tools.Erase(node);
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBarBase::DeleteTool(int id)
 }
 
 bool wxToolBarBase::DeleteTool(int id)


@@ -334,13 +337,13 @@ bool wxToolBarBase::DeleteTool(int id)
 
     if ( !node || !DoDeleteTool(pos, node->GetData()) )
     {
 
     if ( !node || !DoDeleteTool(pos, node->GetData()) )
     {

-        return FALSE;
+        return false;

     }
 
     delete node->GetData();
     m_tools.Erase(node);
 
     }
 
     delete node->GetData();
     m_tools.Erase(node);
 

-    return TRUE;
+    return true;

 }
 
 wxToolBarToolBase *wxToolBarBase::FindById(int id) const
 }
 
 wxToolBarToolBase *wxToolBarBase::FindById(int id) const


@@ -364,6 +367,43 @@ wxToolBarToolBase *wxToolBarBase::FindById(int id) const
     return tool;
 }
 
     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;
+
+        tool->Toggle(false);
+
+        nodeNext = nodeNext->GetNext();
+    }
+
+    wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+    while ( nodePrev )
+    {
+        wxToolBarToolBase *tool = nodePrev->GetData();
+
+        if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+            break;
+
+        tool->Toggle(false);
+
+        nodePrev = nodePrev->GetPrevious();
+    }
+}
+

 void wxToolBarBase::ClearTools()
 {
     WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
 void wxToolBarBase::ClearTools()
 {
     WX_CLEAR_LIST(wxToolBarToolsList, m_tools);


@@ -371,7 +411,7 @@ void wxToolBarBase::ClearTools()
 
 bool wxToolBarBase::Realize()
 {
 
 bool wxToolBarBase::Realize()
 {

-    return TRUE;
+    return true;

 }
 
 wxToolBarBase::~wxToolBarBase()
 }
 
 wxToolBarBase::~wxToolBarBase()


@@ -402,6 +442,7 @@ void wxToolBarBase::ToggleTool(int id, bool toggle)
     {
         if ( tool->Toggle(toggle) )
         {
     {
         if ( tool->Toggle(toggle) )
         {

+            UnToggleRadioGroup(tool);

             DoToggleTool(tool, toggle);
         }
     }
             DoToggleTool(tool, toggle);
         }
     }


@@ -472,7 +513,7 @@ int wxToolBarBase::GetToolPos(int id) const
 bool wxToolBarBase::GetToolState(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 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();
 }
 
     return tool->IsToggled();
 }


@@ -480,7 +521,7 @@ bool wxToolBarBase::GetToolState(int id) const
 bool wxToolBarBase::GetToolEnabled(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 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();
 }
 
     return tool->IsEnabled();
 }


@@ -520,7 +561,7 @@ void wxToolBarBase::SetRows(int WXUNUSED(nRows))
 // event processing
 // ----------------------------------------------------------------------------
 
 // 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);
 bool wxToolBarBase::OnLeftClick(int id, bool toggleDown)
 {
     wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, id);


@@ -535,7 +576,7 @@ bool wxToolBarBase::OnLeftClick(int id, bool toggleDown)
     // Send events to this toolbar instead (and thence up the window hierarchy)
     GetEventHandler()->ProcessEvent(event);
 
     // Send events to this toolbar instead (and thence up the window hierarchy)
     GetEventHandler()->ProcessEvent(event);
 

-    return TRUE;
+    return true;

 }
 
 // Call when right button down.
 }
 
 // Call when right button down.


@@ -581,6 +622,12 @@ void wxToolBarBase::UpdateWindowUI(long flags)
 {
     wxWindowBase::UpdateWindowUI(flags);
 
 {
     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::compatibility_iterator node = m_tools.GetFirst();
     wxEvtHandler* evtHandler = GetEventHandler() ;
 
     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();


@@ -663,7 +710,7 @@ bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
 
     wxGreyOutImage(in, out, darkCol, lightCol, bgCol);
 
 
     wxGreyOutImage(in, out, darkCol, lightCol, bgCol);
 

-    return TRUE;
+    return true;

 }
 
 #endif // wxUSE_TOOLBAR
 }
 
 #endif // wxUSE_TOOLBAR