fixing RawBitmap access

[wxWidgets.git] / src / gtk / tbargtk.cpp

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 05fb57e5e9b68255f5f93b080ac103059e5b14bd..ee9725a088ebc706e6ff932f5675cf4c54f29039 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -25,17 +25,19 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

-#include <glib.h>
+// FIXME: Use GtkImage instead of GtkPixmap. Use the new toolbar API for when gtk runtime is new enough?
+// Beware that the new and old toolbar API may not be mixed in usage.
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
+

 #include "wx/gtk/private.h"
 
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 
 #include "wx/gtk/private.h"
 
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 

-// idle system
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

 // data
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 // data
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;


@@ -540,7 +542,7 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 
         m_blockEvent = true;
 
 
         m_blockEvent = true;
 

-        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(item), toggle );

 
         m_blockEvent = false;
     }
 
         m_blockEvent = false;
     }