added event.Skip() to OnIdle() handler

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index b85ed54228af93139e925ab983b8c717ed68ca58..80802da42e08f8b5a40257837e1b85d964f14646 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -26,9 +26,6 @@
 
 #include "wx/frame.h"
 
-#ifdef __VMS__
-#define gtk_pixmap_set_build_insensitive gtk_pixmap_set_build_insensitiv
-#endif
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
@@ -223,9 +220,7 @@ void wxToolBar::Init()
 {
     m_fg =
     m_bg = (GdkColor *)NULL;
-
     m_toolbar = (GtkToolbar *)NULL;
-
     m_blockNextEvent = FALSE;
 }
 
@@ -406,7 +401,8 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
     }
 
     GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );
     m_width = req.width + m_xMargin;
     m_height = req.height + 2*m_yMargin;