Backed-out PNG8 patch (no time to look at why

[wxWidgets.git] / src / motif / toolbar.cpp

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index a4279e48bf899d2d7355cf98b0bf384860b2e062..54a6419baa0136474dd3a6b22f3c025f02d5dfae 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -17,10 +17,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "toolbar.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
@@ -53,7 +56,7 @@
 // ----------------------------------------------------------------------------
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 #endif
 
 // ----------------------------------------------------------------------------
@@ -239,7 +242,6 @@ bool wxToolBar::Create(wxWindow *parent,
     if( rSize.x == -1 && GetParent() )
         rSize.x = GetParent()->GetSize().x;
 
-    SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   rPos.x, rPos.y, rSize.x, rSize.y);
 
@@ -282,7 +284,7 @@ bool wxToolBar::Realize()
     Pixmap pixmap, insensPixmap;
     wxBitmap bmp, insensBmp;
 
-    wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     while ( node )
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
@@ -361,8 +363,8 @@ bool wxToolBar::Realize()
 
                 if( !tool->GetButtonWidget() )
                 {
-                    DoChangeBackgroundColour((WXWidget) button,
-                                             m_backgroundColour, TRUE);
+                    wxDoChangeBackgroundColour((WXWidget) button,
+                                               m_backgroundColour, TRUE);
 
                     tool->SetWidget(button);
                 }
@@ -389,13 +391,13 @@ bool wxToolBar::Realize()
                     wxColour col;
                     col.SetPixel(backgroundPixel);
 
-                    if( bmp.GetMask() )
+                    if( bmp.Ok() && bmp.GetMask() )
                     {
                         bmp = wxCreateMaskedBitmap(bmp, col);
                         tool->SetNormalBitmap(bmp);
                     }
 
-                    if( insensBmp.GetMask() )
+                    if( insensBmp.Ok() && insensBmp.GetMask() )
                     {
                         insensBmp = wxCreateMaskedBitmap(insensBmp, col);
                         tool->SetDisabledBitmap(insensBmp);
@@ -415,12 +417,12 @@ bool wxToolBar::Realize()
                 wxColour col;
                 col.SetPixel(backgroundPixel);
 
-                pixmap = (Pixmap) bmp.GetPixmap();
+                pixmap = (Pixmap) bmp.GetDrawable();
                 {
                     wxBitmap tmp = tool->GetDisabledBitmap();
 
                     insensPixmap = tmp.Ok() ?
-                            (Pixmap)tmp.GetPixmap() :
+                            (Pixmap)tmp.GetDrawable() :
                             tool->GetInsensPixmap();
                 }
                 
@@ -508,7 +510,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     int packing = GetToolPacking();
     int offset = 0;
 
-    for( wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    for( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
          node; node = node->GetNext() )
     {
         wxToolBarTool *t = (wxToolBarTool*)node->GetData();
@@ -590,8 +592,12 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;
-
-    XtSetSensitive(tool->GetButtonWidget(), (Boolean) enable);
+    if (tool->GetButtonWidget()){
+        XtSetSensitive(tool->GetButtonWidget(), (Boolean) enable);
+    } else if (wxTOOL_STYLE_CONTROL == tool->GetStyle()){
+        // Controls (such as wxChoice) do not have button widgets
+        tool->GetControl()->Enable(enable);
+    }
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *toolBase, bool toggle)
@@ -645,7 +651,7 @@ void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
 wxToolBarToolBase *wxToolBar::FindToolByWidget(WXWidget w) const
 {
-    wxToolBarToolsList::Node* node = m_tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     while ( node )
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();