re-renamed DoCreate() to XmDoCreateTLW() to avoid virtual function hiding in other...

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 25ca112c81bdc927b5081c5e7606fd3a30ec9b0b..d5d9ef0ff6e39ec477af08c40cb94b94874eddb1 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -2,11 +2,11 @@
 // Name:        common/tbarbase.cpp
 // Purpose:     wxToolBarBase implementation
 // Author:      Julian Smart
 // 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$
 // 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,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "tbarbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -35,29 +31,24 @@
 #endif
 
 #include "wx/frame.h"
 #endif
 
 #include "wx/frame.h"

-#include "wx/image.h"
-#include "wx/settings.h"

 
 

-// For ::UpdateWindow
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
+#if wxUSE_IMAGE
+    #include "wx/image.h"
+    #include "wx/settings.h"
+#endif // wxUSE_IMAGE

 
 

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

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxWindows macros
+// wxWidgets 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"
 

-WX_DEFINE_LIST(wxToolBarToolsList);
+WX_DEFINE_LIST(wxToolBarToolsList)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -67,62 +58,85 @@ 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;
+}
+
+#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);

 }
 
 }
 

-wxToolBarToolBase::~wxToolBarToolBase()
+void wxToolBarToolBase::SetBitmap2(const wxBitmap& bmp)

 {
 {

+    SetDisabledBitmap(bmp);

 }
 
 }
 

+#endif // WXWIN_COMPATIBILITY_2_2
+

 // ----------------------------------------------------------------------------
 // wxToolBarBase adding/deleting items
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxToolBarBase adding/deleting items
 // ----------------------------------------------------------------------------


@@ -130,49 +144,71 @@ 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_xMargin = m_yMargin = 0;

-

     m_maxRows = m_maxCols = 0;
     m_maxRows = m_maxCols = 0;

+    m_toolPacking = m_toolSeparation = 0;
+    m_defaultWidth = 16;
+    m_defaultHeight = 15;

 }
 
 }
 

-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);
+    InvalidateBestSize();
+    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;


@@ -196,18 +232,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());


@@ -219,8 +279,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) )


@@ -238,7 +299,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 )


@@ -260,35 +321,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 )


@@ -299,19 +358,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() )
     {


@@ -328,18 +388,70 @@ 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;
+
+        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()
 {
 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);
+
+    // notify the frame that it doesn't have a tool bar any longer to avoid
+    // dangling pointers
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && frame->GetToolBar() == this )
+    {
+        frame->SetToolBar(NULL);
+    }

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


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

+            UnToggleRadioGroup(tool);

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


@@ -416,10 +529,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();
 }


@@ -427,7 +556,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();
 }


@@ -435,7 +564,7 @@ bool wxToolBarBase::GetToolEnabled(int id) const
 wxString wxToolBarBase::GetToolShortHelp(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 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();
 }
 
     return tool->GetShortHelp();
 }


@@ -443,7 +572,7 @@ wxString wxToolBarBase::GetToolShortHelp(int id) const
 wxString wxToolBarBase::GetToolLongHelp(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 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();
 }
 
     return tool->GetLongHelp();
 }


@@ -467,7 +596,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);


@@ -482,7 +611,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.


@@ -498,7 +627,7 @@ void wxToolBarBase::OnRightClick(int id,
 }
 
 // Called when the mouse cursor enters a tool bitmap (no button pressed).
 }
 
 // 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.
 // 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.


@@ -508,46 +637,37 @@ void wxToolBarBase::OnMouseEnter(int id)
     event.SetEventObject(this);
     event.SetInt(id);
 
     event.SetEventObject(this);
     event.SetInt(id);
 

-    (void)GetEventHandler()->ProcessEvent(event);
-
-    wxToolBarToolBase *tool = FindById(id);
-    if ( !tool || !tool->GetLongHelp() )
-        return;
-

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

-    if ( !frame )
-        return;
+    if( frame )
+    {
+        wxString help;
+        wxToolBarToolBase* tool = id == wxID_ANY ? (wxToolBarToolBase*)NULL : FindById(id);
+        if(tool)
+            help = tool->GetLongHelp();
+        frame->DoGiveHelp( help, id != wxID_ANY );
+    }

 
 

-    frame->SetStatusText(tool->GetLongHelp());
+    (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();
+    wxWindowBase::UpdateWindowUI(flags);

 
 

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


@@ -570,156 +690,73 @@ void wxToolBarBase::DoToolbarUpdates()
     }
 }
 
     }
 }
 

-///////////// button-label rendering helpers //////////////////
-
-#define MIN_COLOR_DIFF 10
+#if wxUSE_IMAGE

 
 

-#define IS_IN_ARRAY(x,y) ( (x) < width && (y) < height && (x) >= 0 && (y) >= 0 )
-
-#define IS_GREATER(red1,green1,blue1, red2,green2,blue2) ( ( red1 > red2 + MIN_COLOR_DIFF ) && \
-                                ( green1 > green2 + MIN_COLOR_DIFF ) &&  \
-                                ( blue1 > blue2 + MIN_COLOR_DIFF )     \
-                              )
-
-// Helper function, used by wxCreateGreyedImage
+/*
+ * 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)

 {
 {

-    // Second attempt, just making things monochrome
-    int width = src.GetWidth();
-    int height = src.GetHeight();
+    dst = src.Copy();

 
 

-    unsigned int redCur, greenCur, blueCur;
-
-    int x, y;
-    for (x = 0; x < width; x++)
+    unsigned char rBg, gBg, bBg;
+    if ( src.HasMask() )

     {
     {

-       for (y = 1; y < height; y++)
-       {
-            redCur = src.GetRed(x, y);
-            greenCur = src.GetGreen(x, y);
-            blueCur = src.GetBlue(x, y);     
-
-           // Change light things to the background colour
-            if ( redCur >= (lightCol.Red() - 50) && greenCur >= (lightCol.Green() - 50) && blueCur >= (lightCol.Blue() - 50) )
-            {
-                dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
-            }
-            else if ( redCur == bgCol.Red() && greenCur == bgCol.Green() && blueCur == bgCol.Blue() )
-            {
-               // Leave the background colour as-is
-                // dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
-            }
-            else // if ( redCur <= darkCol.Red() && greenCur <= darkCol.Green() && blueCur <= darkCol.Blue() )
-            {
-               // Change dark things to really dark
-                dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue());
-            }
-       }
+        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);

 
 

-    // First attempt, causes problems with scissors icon
-#if 0
-    int x = 0;
-    int y = 1;
+    const wxColour colDark = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+    const wxColour colLight = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);

 
 

-    int width = src.GetWidth();
-    int height = src.GetHeight();
-
-    unsigned int redCur, greenCur, blueCur;
+    // Second attempt, just making things monochrome
+    const int width = src.GetWidth();
+    const int height = src.GetHeight();

 
 

-    do
+    for ( int x = 0; x < width; x++ )

     {
     {

-        redCur = src.GetRed(x, y);
-        greenCur = src.GetGreen(x, y);
-        blueCur = src.GetBlue(x, y);     
-
-        if ( IS_IN_ARRAY(x-1,y-1) )
+        for ( int y = 0; y < height; y++ )

         {
         {

-            unsigned int redUpper = src.GetRed(x-1, y-1);
-            unsigned int greenUpper = src.GetGreen(x-1, y-1);
-            unsigned int blueUpper = src.GetBlue(x-1, y-1);     
+            const int r = src.GetRed(x, y);
+            const int g = src.GetGreen(x, y);
+            const int b = src.GetBlue(x, y);

 
 

-            // if the upper element is lighter than current
-            if ( IS_GREATER(redUpper, greenUpper, blueUpper, redCur, greenCur, blueCur) )
-            {
-                dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue());
-            }
-            // if the current element is ligher than the upper
-            else if ( IS_GREATER(redCur, greenCur, blueCur, redUpper, greenUpper, blueUpper) )
-            {
-                dest.SetRGB(x,y, lightCol.Red(), lightCol.Green(), lightCol.Blue());
-            }
-            else
+            if ( r == rBg && g == gBg && b == bBg )

             {
             {

-                unsigned int red1 = dest.GetRed(x-1, y-1);
-                unsigned int green1 = dest.GetGreen(x-1, y-1);
-                unsigned int blue1 = dest.GetBlue(x-1, y-1);     
-
-                if ( red1 == lightCol.Red() && green1 == lightCol.Green() && blue1 == lightCol.Blue() )
-                    dest.SetRGB(x, y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
-                else if ( red1 == darkCol.Red() && green1 == darkCol.Green() && blue1 == darkCol.Blue() )
-                    dest.SetRGB(x, y, darkCol.Red(), darkCol.Green(), darkCol.Blue());
-                else
-                    dest.SetRGB(x, y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
-            }
-        }
-
-        // go zig-zag
-
-        if ( IS_IN_ARRAY(x+1,y-1) ) 
-        {
-            ++x;
-            --y;
-        }
-        else
-        {
-            while ( IS_IN_ARRAY(x-1,y+1) ) 
-            {
-                --x;
-                ++y;
+                // Leave the background colour as-is
+                continue;

             }
 
             }
 

-            if ( IS_IN_ARRAY(x,y+1) )
+            // Change light things to the background colour
+            wxColour col;
+            if ( r >= (colLight.Red() - 50) &&
+                    g >= (colLight.Green() - 50) &&
+                        b >= (colLight.Blue() - 50) )

             {
             {

-                ++y;
-                continue;
+                col = colBg;

             }
             }

-            else
+            else // Change dark things to really dark

             {
             {

-                if ( IS_IN_ARRAY(x+1,y) )
-                {
-                    ++x;
-                    continue;
-                }
-                else break;
+                col = colDark;

             }
             }

+
+            dst.SetRGB(x, y, col.Red(), col.Green(), col.Blue());

         }
         }

+    }

 
 

-    } while (1);
-#endif
+    return true;

 }
 
 }
 

-/*
- * 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
 
 #endif // wxUSE_TOOLBAR