no need to check for wxID_HELP buttons in SetLabel() now that it's overridden in...

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index f2310dc1a912e1e92dfdf62172f7ae7efd2beeac..97fe65f63142988dcc7a132be923b9948e0f51d8 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/tbarbase.cpp
+// Name:        src/common/tbarbase.cpp

 // Purpose:     wxToolBarBase implementation
 // Author:      Julian Smart
 // 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$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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"
 


@@ -30,18 +26,20 @@
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

+#include "wx/toolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/control.h"
 #ifndef WX_PRECOMP
     #include "wx/control.h"

+    #include "wx/frame.h"
+    #include "wx/settings.h"
+    #if WXWIN_COMPATIBILITY_2_8
+        #include "wx/image.h"
+    #endif // WXWIN_COMPATIBILITY_2_8
+    #include "wx/menu.h"

 #endif
 
 #endif
 

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

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

-// wxWindows macros
+// wxWidgets macros

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


@@ -49,7 +47,7 @@ END_EVENT_TABLE()
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxToolBarToolsList);
+WX_DEFINE_LIST(wxToolBarToolsList)

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


@@ -59,7 +57,15 @@ WX_DEFINE_LIST(wxToolBarToolsList);
 // wxToolBarToolBase
 // ----------------------------------------------------------------------------
 
 // wxToolBarToolBase
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)   
+IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)
+
+wxToolBarToolBase::~wxToolBarToolBase()
+{
+    delete m_dropdownMenu;
+    if ( IsControl() )
+        GetControl()->Destroy();
+}
+

 
 bool wxToolBarToolBase::Enable(bool enable)
 {
 
 bool wxToolBarToolBase::Enable(bool enable)
 {


@@ -114,10 +120,14 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help)
     return true;
 }
 
     return true;
 }
 

-wxToolBarToolBase::~wxToolBarToolBase()
+
+void wxToolBarToolBase::SetDropdownMenu(wxMenu* menu)

 {
 {

+    delete m_dropdownMenu;
+    m_dropdownMenu = menu;

 }
 
 }
 

+

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


@@ -126,8 +136,19 @@ wxToolBarBase::wxToolBarBase()
 {
     // the list owns the pointers
     m_xMargin = m_yMargin = 0;
 {
     // the list owns the pointers
     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;
+}
+
+void wxToolBarBase::FixupStyle()
+{
+    if ( !HasFlag(wxTB_TOP | wxTB_LEFT | wxTB_RIGHT | wxTB_BOTTOM) )
+    {
+        // this is the default
+        m_windowStyle |= wxTB_TOP;
+    }

 }
 
 wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
 }
 
 wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,


@@ -141,6 +162,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);
 }


@@ -155,7 +177,7 @@ wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos,
                                              const wxString& longHelp,
                                              wxObject *clientData)
 {
                                              const wxString& longHelp,
                                              wxObject *clientData)
 {

-    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+    wxCHECK_MSG( pos <= GetToolsCount(), NULL,

                  _T("invalid position in wxToolBar::InsertTool()") );
 
     wxToolBarToolBase *tool = CreateTool(id, label, bitmap, bmpDisabled, kind,
                  _T("invalid position in wxToolBar::InsertTool()") );
 
     wxToolBarToolBase *tool = CreateTool(id, label, bitmap, bmpDisabled, kind,


@@ -179,7 +201,7 @@ wxToolBarToolBase *wxToolBarBase::AddTool(wxToolBarToolBase *tool)
 wxToolBarToolBase *
 wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool)
 {
 wxToolBarToolBase *
 wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool)
 {

-    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+    wxCHECK_MSG( pos <= GetToolsCount(), NULL,

                  _T("invalid position in wxToolBar::InsertTool()") );
 
     if ( !tool || !DoInsertTool(pos, tool) )
                  _T("invalid position in wxToolBar::InsertTool()") );
 
     if ( !tool || !DoInsertTool(pos, tool) )


@@ -188,27 +210,32 @@ wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool)
     }
 
     m_tools.Insert(pos, tool);
     }
 
     m_tools.Insert(pos, tool);

+    tool->Attach(this);

 
     return tool;
 }
 
 
     return tool;
 }
 

-wxToolBarToolBase *wxToolBarBase::AddControl(wxControl *control)
+wxToolBarToolBase *
+wxToolBarBase::AddControl(wxControl *control, const wxString& label)

 {
 {

-    return InsertControl(GetToolsCount(), control);
+    return InsertControl(GetToolsCount(), control, label);

 }
 
 }
 

-wxToolBarToolBase *wxToolBarBase::InsertControl(size_t pos, wxControl *control)
+wxToolBarToolBase *
+wxToolBarBase::InsertControl(size_t pos,
+                             wxControl *control,
+                             const wxString& label)

 {
 {

-    wxCHECK_MSG( control, (wxToolBarToolBase *)NULL,
+    wxCHECK_MSG( control, NULL,

                  _T("toolbar: can't insert NULL control") );
 
                  _T("toolbar: can't insert NULL control") );
 

-    wxCHECK_MSG( control->GetParent() == this, (wxToolBarToolBase *)NULL,
+    wxCHECK_MSG( control->GetParent() == this, NULL,

                  _T("control must have toolbar as parent") );
 
                  _T("control must have toolbar as parent") );
 

-    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+    wxCHECK_MSG( pos <= GetToolsCount(), NULL,

                  _T("invalid position in wxToolBar::InsertControl()") );
 
                  _T("invalid position in wxToolBar::InsertControl()") );
 

-    wxToolBarToolBase *tool = CreateTool(control);
+    wxToolBarToolBase *tool = CreateTool(control, label);

 
     if ( !InsertTool(pos, tool) )
     {
 
     if ( !InsertTool(pos, tool) )
     {


@@ -253,13 +280,13 @@ wxToolBarToolBase *wxToolBarBase::AddSeparator()
 
 wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
 {
 
 wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
 {

-    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+    wxCHECK_MSG( pos <= GetToolsCount(), NULL,

                  _T("invalid position in wxToolBar::InsertSeparator()") );
 
     wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR,
                                          wxEmptyString,
                                          wxNullBitmap, wxNullBitmap,
                  _T("invalid position in wxToolBar::InsertSeparator()") );
 
     wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR,
                                          wxEmptyString,
                                          wxNullBitmap, wxNullBitmap,

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

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


@@ -290,17 +317,19 @@ wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
     {
         // don't give any error messages - sometimes we might call RemoveTool()
         // without knowing whether the tool is or not in the toolbar
     {
         // don't give any error messages - sometimes we might call RemoveTool()
         // without knowing whether the tool is or not in the toolbar

-        return (wxToolBarToolBase *)NULL;
+        return NULL;

     }
 
     wxToolBarToolBase *tool = node->GetData();
     }
 
     wxToolBarToolBase *tool = node->GetData();

+    wxCHECK_MSG( tool, NULL, "NULL tool in the tools list?" );
+

     if ( !DoDeleteTool(pos, tool) )
     if ( !DoDeleteTool(pos, tool) )

-    {
-        return (wxToolBarToolBase *)NULL;
-    }
+        return NULL;

 
     m_tools.Erase(node);
 
 
     m_tools.Erase(node);
 

+    tool->Detach();
+

     return tool;
 }
 
     return tool;
 }
 


@@ -347,7 +376,7 @@ bool wxToolBarBase::DeleteTool(int id)
 
 wxToolBarToolBase *wxToolBarBase::FindById(int id) const
 {
 
 wxToolBarToolBase *wxToolBarBase::FindById(int id) const
 {

-    wxToolBarToolBase *tool = (wxToolBarToolBase *)NULL;
+    wxToolBarToolBase *tool = NULL;

 
     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
           node;
 
     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
           node;


@@ -379,12 +408,15 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
     wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
     while ( nodeNext )
     {
     wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
     while ( nodeNext )
     {

-        wxToolBarToolBase *tool = nodeNext->GetData();
+        wxToolBarToolBase *toolNext = nodeNext->GetData();

 
 

-        if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+        if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO )

             break;
 
             break;
 

-        tool->Toggle(false);
+        if ( toolNext->Toggle(false) )
+        {
+            DoToggleTool(toolNext, false);
+        }

 
         nodeNext = nodeNext->GetNext();
     }
 
         nodeNext = nodeNext->GetNext();
     }


@@ -392,12 +424,15 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
     wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
     while ( nodePrev )
     {
     wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
     while ( nodePrev )
     {

-        wxToolBarToolBase *tool = nodePrev->GetData();
+        wxToolBarToolBase *toolNext = nodePrev->GetData();

 
 

-        if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+        if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO )

             break;
 
             break;
 

-        tool->Toggle(false);
+        if ( toolNext->Toggle(false) )
+        {
+            DoToggleTool(toolNext, false);
+        }

 
         nodePrev = nodePrev->GetPrevious();
     }
 
         nodePrev = nodePrev->GetPrevious();
     }


@@ -405,7 +440,10 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
 
 void wxToolBarBase::ClearTools()
 {
 
 void wxToolBarBase::ClearTools()
 {

-    WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
+    while ( GetToolsCount() )
+    {
+        DeleteToolByPos(0);
+    }

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


@@ -416,6 +454,14 @@ bool wxToolBarBase::Realize()
 wxToolBarBase::~wxToolBarBase()
 {
     WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
 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);
+    }

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


@@ -481,7 +527,7 @@ wxObject *wxToolBarBase::GetToolClientData(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 
 {
     wxToolBarToolBase *tool = FindById(id);
 

-    return tool ? tool->GetClientData() : (wxObject *)NULL;
+    return tool ? tool->GetClientData() : NULL;

 }
 
 void wxToolBarBase::SetToolClientData(int id, wxObject *clientData)
 }
 
 void wxToolBarBase::SetToolClientData(int id, wxObject *clientData)


@@ -528,7 +574,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();
 }


@@ -536,7 +582,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();
 }


@@ -556,6 +602,12 @@ void wxToolBarBase::SetRows(int WXUNUSED(nRows))
     // nothing
 }
 
     // nothing
 }
 

+bool wxToolBarBase::IsVertical() const
+{
+    return HasFlag(wxTB_LEFT | wxTB_RIGHT);
+}
+
+

 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------


@@ -573,7 +625,7 @@ bool wxToolBarBase::OnLeftClick(int id, bool toggleDown)
     event.SetExtraLong((long)toggleDown);
 
     // Send events to this toolbar instead (and thence up the window hierarchy)
     event.SetExtraLong((long)toggleDown);
 
     // Send events to this toolbar instead (and thence up the window hierarchy)

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

 
     return true;
 }
 
     return true;
 }


@@ -591,7 +643,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.


@@ -602,11 +654,19 @@ void wxToolBarBase::OnMouseEnter(int id)
     event.SetInt(id);
 
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     event.SetInt(id);
 
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

-    if( frame )
+    if ( frame )

     {
     {

-        wxToolBarToolBase* tool = id == -1 ? (wxToolBarToolBase*)0 : FindById(id);
-        wxString help = tool ? tool->GetLongHelp() : wxString();
-        frame->DoGiveHelp( help, id != -1 );
+        wxString help;
+        if ( id != wxID_ANY )
+        {
+           const wxToolBarToolBase * const tool = FindById(id);
+           if ( tool )
+               help = tool->GetLongHelp();
+        }
+
+        // call DoGiveHelp() even if help string is empty to avoid showing the
+        // help for the previously selected tool when another one is selected
+        frame->DoGiveHelp(help, id != wxID_ANY);

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


@@ -621,13 +681,27 @@ void wxToolBarBase::UpdateWindowUI(long flags)
 {
     wxWindowBase::UpdateWindowUI(flags);
 
 {
     wxWindowBase::UpdateWindowUI(flags);
 

+    // don't waste time updating state of tools in a hidden toolbar
+    if ( !IsShown() )
+        return;
+
+    // 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();
           node;
           node = node->GetNext() )
     {
     wxEvtHandler* evtHandler = GetEventHandler() ;
 
     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
           node;
           node = node->GetNext() )
     {

-        int id = node->GetData()->GetId();
+        wxToolBarToolBase * const tool = node->GetData();
+        if ( tool->IsSeparator() )
+            continue;
+
+        int id = tool->GetId();

 
         wxUpdateUIEvent event(id);
         event.SetEventObject(this);
 
         wxUpdateUIEvent event(id);
         event.SetEventObject(this);


@@ -646,64 +720,31 @@ void wxToolBarBase::UpdateWindowUI(long flags)
     }
 }
 
     }
 }
 

-// Helper function, used by wxCreateGreyedImage
-
-static void wxGreyOutImage( const wxImage& src,
-                            wxImage& dest,
-                            const wxColour& darkCol,
-                            const wxColour& lightCol,
-                            const wxColour& bgCol )
+bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu)

 {
 {

-    // Second attempt, just making things monochrome
-    int width = src.GetWidth();
-    int height = src.GetHeight();
+    wxToolBarToolBase * const tool = FindById(toolid);
+    wxCHECK_MSG( tool, false, _T("invalid tool id") );

 
 

-    int redCur, greenCur, blueCur;
-    for ( int x = 0; x < width; x++ )
-    {
-        for ( int y = 1; y < height; y++ )
-        {
-            redCur = src.GetRed(x, y);
-            greenCur = src.GetGreen(x, y);
-            blueCur = src.GetBlue(x, y);
+    wxCHECK_MSG( tool->GetKind() == wxITEM_DROPDOWN, false,
+                    _T("menu can be only associated with drop down tools") );

 
 

-            // 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());
-            }
-        }
-    }
+    tool->SetDropdownMenu(menu);
+
+    return true;

 }
 
 }
 

-/*
- * Make a greyed-out image suitable for disabled buttons.
- * This code is adapted from wxNewBitmapButton in FL.
- */
+#if WXWIN_COMPATIBILITY_2_8

 
 bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
 {
 
 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;
+#if wxUSE_IMAGE
+    out = in.ConvertToGreyscale();
+    if ( out.Ok() )
+        return true;
+#endif // wxUSE_IMAGE
+    return false;

 }
 
 }
 

+#endif // WXWIN_COMPATIBILITY_2_8
+

 #endif // wxUSE_TOOLBAR
 #endif // wxUSE_TOOLBAR