Applied patch [ 864469 ] WaitForAccept(): 100% CPU Usage (NON-GUI application)

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 93d6bbfc3f1dad28a521f16a7fc5eec955fb1598..f2310dc1a912e1e92dfdf62172f7ae7efd2beeac 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -5,8 +5,8 @@
 // Modified by: VZ at 11.12.99 (wxScrollableToolBar splitted off)
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by: VZ at 11.12.99 (wxScrollableToolBar splitted off)
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tbarbase.h"
 #endif
 
     #pragma implementation "tbarbase.h"
 #endif
 


@@ -38,16 +38,13 @@
 #include "wx/image.h"
 #include "wx/settings.h"
 
 #include "wx/image.h"
 #include "wx/settings.h"
 

-#include "wx/tbarbase.h"
+#include "wx/toolbar.h"

 
 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxToolBarBase, wxControl)
-

 BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
 BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)

-    EVT_IDLE(wxToolBarBase::OnIdle)

 END_EVENT_TABLE()
 
 #include "wx/listimpl.cpp"
 END_EVENT_TABLE()
 
 #include "wx/listimpl.cpp"


@@ -62,56 +59,59 @@ 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)
 {

-    wxASSERT_MSG( m_isToggle, _T("can't toggle this tool") );
+    wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );

 
     if ( m_toggled == toggle )
 
     if ( m_toggled == toggle )

-        return FALSE;
+        return false;

 
     m_toggled = toggle;
 
 
     m_toggled = toggle;
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBarToolBase::SetToggle(bool toggle)
 {
 }
 
 bool wxToolBarToolBase::SetToggle(bool toggle)
 {

-    if ( m_isToggle == toggle )
-        return FALSE;
+    wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;
+    if ( m_kind == kind )
+        return false;

 
 

-    m_isToggle = toggle;
+    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()


@@ -125,49 +125,68 @@ wxToolBarToolBase::~wxToolBarToolBase()
 wxToolBarBase::wxToolBarBase()
 {
     // the list owns the pointers
 wxToolBarBase::wxToolBarBase()
 {
     // the list owns the pointers

-    m_tools.DeleteContents(TRUE);
-

     m_xMargin = m_yMargin = 0;
 
     m_maxRows = m_maxCols = 0;
 }
 
     m_xMargin = m_yMargin = 0;
 
     m_maxRows = m_maxCols = 0;
 }
 

-wxToolBarToolBase *wxToolBarBase::AddTool(int id,
-                                          const wxBitmap& bitmap,
-                                          const wxBitmap& pushedBitmap,
-                                          bool toggle,
-                                          wxCoord WXUNUSED(xPos),
-                                          wxCoord WXUNUSED(yPos),
-                                          wxObject *clientData,
-                                          const wxString& helpString1,
-                                          const wxString& helpString2)
+wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
+                                            const wxString& label,
+                                            const wxBitmap& bitmap,
+                                            const wxBitmap& bmpDisabled,
+                                            wxItemKind kind,
+                                            const wxString& shortHelp,
+                                            const wxString& longHelp,
+                                            wxObject *clientData,
+                                            wxCoord WXUNUSED(xPos),
+                                            wxCoord WXUNUSED(yPos))

 {
 {

-    return InsertTool(GetToolsCount(), id, bitmap, pushedBitmap,
-                      toggle, clientData, helpString1, helpString2);
+    return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled,
+                      kind, shortHelp, longHelp, clientData);

 }
 
 wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos,
                                              int id,
 }
 
 wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos,
                                              int id,

+                                             const wxString& label,

                                              const wxBitmap& bitmap,
                                              const wxBitmap& bitmap,

-                                             const wxBitmap& pushedBitmap,
-                                             bool toggle,
-                                             wxObject *clientData,
-                                             const wxString& helpString1,
-                                             const wxString& helpString2)
+                                             const wxBitmap& bmpDisabled,
+                                             wxItemKind kind,
+                                             const wxString& shortHelp,
+                                             const wxString& longHelp,
+                                             wxObject *clientData)

 {
     wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
                  _T("invalid position in wxToolBar::InsertTool()") );
 
 {
     wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
                  _T("invalid position in wxToolBar::InsertTool()") );
 

-    wxToolBarToolBase *tool = CreateTool(id, bitmap, pushedBitmap, toggle,
-                                         clientData, helpString1, helpString2);
+    wxToolBarToolBase *tool = CreateTool(id, label, bitmap, bmpDisabled, kind,
+                                         clientData, shortHelp, longHelp);

 
 

-    if ( !tool || !DoInsertTool(pos, tool) )
+    if ( !InsertTool(pos, tool) )

     {
         delete tool;
 
         return NULL;
     }
 
     {
         delete tool;
 
         return NULL;
     }
 

+    return tool;
+}
+
+wxToolBarToolBase *wxToolBarBase::AddTool(wxToolBarToolBase *tool)
+{
+    return InsertTool(GetToolsCount(), tool);
+}
+
+wxToolBarToolBase *
+wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool)
+{
+    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+                 _T("invalid position in wxToolBar::InsertTool()") );
+
+    if ( !tool || !DoInsertTool(pos, tool) )
+    {
+        return NULL;
+    }
+

     m_tools.Insert(pos, tool);
 
     return tool;
     m_tools.Insert(pos, tool);
 
     return tool;


@@ -191,18 +210,42 @@ wxToolBarToolBase *wxToolBarBase::InsertControl(size_t pos, wxControl *control)
 
     wxToolBarToolBase *tool = CreateTool(control);
 
 
     wxToolBarToolBase *tool = CreateTool(control);
 

-    if ( !tool || !DoInsertTool(pos, tool) )
+    if ( !InsertTool(pos, tool) )

     {
         delete tool;
 
         return NULL;
     }
 
     {
         delete tool;
 
         return NULL;
     }
 

-    m_tools.Insert(pos, tool);
-

     return tool;
 }
 
     return tool;
 }
 

+wxControl *wxToolBarBase::FindControl( int id )
+{
+    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        const wxToolBarToolBase * const tool = node->GetData();
+        if ( tool->IsControl() )
+        {
+            wxControl * const control = tool->GetControl();
+
+            if ( !control )
+            {
+                wxFAIL_MSG( _T("NULL control in toolbar?") );
+            }
+            else if ( control->GetId() == id )
+            {
+                // found
+                return control;
+            }
+        }
+    }
+
+   return NULL;
+}
+

 wxToolBarToolBase *wxToolBarBase::AddSeparator()
 {
     return InsertSeparator(GetToolsCount());
 wxToolBarToolBase *wxToolBarBase::AddSeparator()
 {
     return InsertSeparator(GetToolsCount());


@@ -214,8 +257,9 @@ wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
                  _T("invalid position in wxToolBar::InsertSeparator()") );
 
     wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR,
                  _T("invalid position in wxToolBar::InsertSeparator()") );
 
     wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR,

+                                         wxEmptyString,

                                          wxNullBitmap, wxNullBitmap,
                                          wxNullBitmap, wxNullBitmap,

-                                         FALSE, (wxObject *)NULL,
+                                         wxITEM_SEPARATOR, (wxObject *)NULL,

                                          wxEmptyString, wxEmptyString);
 
     if ( !tool || !DoInsertTool(pos, tool) )
                                          wxEmptyString, wxEmptyString);
 
     if ( !tool || !DoInsertTool(pos, tool) )


@@ -233,7 +277,7 @@ wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
 wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
 {
     size_t pos = 0;
 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 )
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         if ( node->GetData()->GetId() == id )


@@ -255,35 +299,33 @@ wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
         return (wxToolBarToolBase *)NULL;
     }
 
         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)
 {
 
     return tool;
 }
 
 bool wxToolBarBase::DeleteToolByPos(size_t pos)
 {

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

                  _T("invalid position in wxToolBar::DeleteToolByPos()") );
 
                  _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()) )
     {
 
     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;
 }
 
 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 )
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         if ( node->GetData()->GetId() == id )


@@ -294,19 +336,20 @@ bool wxToolBarBase::DeleteTool(int id)
 
     if ( !node || !DoDeleteTool(pos, node->GetData()) )
     {
 
     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;
 
 }
 
 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() )
     {
           node;
           node = node->GetNext() )
     {


@@ -323,18 +366,56 @@ 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()
 {
 void wxToolBarBase::ClearTools()
 {

-    m_tools.Clear();
+    WX_CLEAR_LIST(wxToolBarToolsList, m_tools);

 }
 
 bool wxToolBarBase::Realize()
 {
 }
 
 bool wxToolBarBase::Realize()
 {

-    return TRUE;
+    return true;

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

+    WX_CLEAR_LIST(wxToolBarToolsList, m_tools);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


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

+            UnToggleRadioGroup(tool);

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


@@ -411,10 +493,26 @@ void wxToolBarBase::SetToolClientData(int id, wxObject *clientData)
     tool->SetClientData(clientData);
 }
 
     tool->SetClientData(clientData);
 }
 

+int wxToolBarBase::GetToolPos(int id) const
+{
+    size_t pos = 0;
+    wxToolBarToolsList::compatibility_iterator node;
+
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        if ( node->GetData()->GetId() == id )
+            return pos;
+
+        pos++;
+    }
+
+    return wxNOT_FOUND;
+}
+

 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();
 }


@@ -422,7 +520,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();
 }


@@ -462,7 +560,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);


@@ -477,7 +575,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.


@@ -503,54 +601,29 @@ void wxToolBarBase::OnMouseEnter(int id)
     event.SetEventObject(this);
     event.SetInt(id);
 
     event.SetEventObject(this);
     event.SetInt(id);
 

-    (void)GetEventHandler()->ProcessEvent(event);
-

     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

-    if ( !frame )
-        return;
-
-    wxString helpstring;
-
-    if ( id != -1 )
+    if( frame )

     {
     {

-        wxToolBarToolBase *tool = FindById(id);
-        if ( tool )
-            helpstring = tool->GetLongHelp();
+        wxToolBarToolBase* tool = id == -1 ? (wxToolBarToolBase*)0 : FindById(id);
+        wxString help = tool ? tool->GetLongHelp() : wxString();
+        frame->DoGiveHelp( help, id != -1 );

     }
 
     }
 

-    // set the status text anyhow, even if the string is empty: this ensures
-    // that it is cleared when the mouse leaves the toolbar or enters a tool
-    // without help
-    frame->SetStatusText(helpstring);
+    (void)GetEventHandler()->ProcessEvent(event);

 }
 
 // ----------------------------------------------------------------------------
 // UI updates
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // UI updates
 // ----------------------------------------------------------------------------
 

-void wxToolBarBase::OnIdle(wxIdleEvent& event)
-{
-    DoToolbarUpdates();
-
-    event.Skip();
-}
-

 // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
 // 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();
-
-#ifdef __WXMSW__
-    wxWindow* focusWin = wxFindFocusDescendant(parent);
-#else
-    wxWindow* focusWin = (wxWindow*) NULL;
-#endif
+    wxWindowBase::UpdateWindowUI(flags);

 
 

-    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() )
     {
           node;
           node = node->GetNext() )
     {


@@ -630,7 +703,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