fixing RawBitmap access

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 555803cd80603293e03826a3383c62960e5f057a..ee9725a088ebc706e6ff932f5675cf4c54f29039 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -25,17 +25,19 @@
 
 #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
 // ----------------------------------------------------------------------------
 
-// idle system
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 // data
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
@@ -57,9 +59,7 @@ static void GetGtkStyle(long style,
         *gtkStyle = style & wxTB_NOICONS
                         ? GTK_TOOLBAR_TEXT
                         : (
-#ifdef __WXGTK20__
                           style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ :
-#endif // __WXGTK20__
                           GTK_TOOLBAR_BOTH);
     }
     else // no text, hence we must have the icons or what would we show?
@@ -128,11 +128,9 @@ public:
         {
             GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
                                                : (GdkBitmap *)NULL;
-#ifdef __WXGTK20__
             if (bitmap.HasPixbuf())
                 gtk_image_set_from_pixbuf( GTK_IMAGE(m_pixmap), bitmap.GetPixbuf() );
             else
-#endif // !__WXGTK20__
                 gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
         }
     }
@@ -292,20 +290,12 @@ bool wxToolBar::Create( wxWindow *parent,
         return false;
     }
 
-#ifdef __WXGTK20__
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     GtkSetStyle();
 
     // Doesn't work this way.
     // GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
     // gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);
-#else
-    GtkOrientation orient;
-    GtkToolbarStyle gtkStyle;
-    GetGtkStyle(style, &orient, &gtkStyle);
-
-    m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) );
-#endif
 
     SetToolSeparation(7);
 
@@ -329,7 +319,7 @@ bool wxToolBar::Create( wxWindow *parent,
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 
     // FIXME: there is no such function for toolbars in 2.0
-#ifndef __WXGTK20__
+#if 0
     if (style & wxTB_FLAT)
         gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
 #endif
@@ -363,13 +353,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;
 
-#ifndef __WXGTK20__
-    // if we have inserted a space before all the tools we must change the GTK
-    // index by 1
-    size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;
-#else
     size_t posGtk = pos;
-#endif
 
     if ( tool->IsButton() )
     {
@@ -389,7 +373,6 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
             GtkWidget *tool_pixmap = (GtkWidget *)NULL;
 
 
-#ifdef __WXGTK20__
             if (bitmap.HasPixbuf())
             {
                 tool_pixmap = gtk_image_new();
@@ -397,7 +380,6 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                 tool->SetPixmap(bitmap);
             }
             else
-#endif
             {
                 GdkPixmap *pixmap = bitmap.GetPixmap();
 
@@ -476,14 +458,12 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                     return false;
                 }
 
-                gtk_signal_connect( GTK_OBJECT(tool->m_item),
-                                    "enter_notify_event",
-                                    GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
-                                    (gpointer)tool );
-                gtk_signal_connect( GTK_OBJECT(tool->m_item),
-                                    "leave_notify_event",
-                                    GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
-                                    (gpointer)tool );
+                g_signal_connect (tool->m_item, "enter_notify_event",
+                                  G_CALLBACK (gtk_toolbar_tool_callback),
+                                  tool);
+                g_signal_connect (tool->m_item, "leave_notify_event",
+                                  G_CALLBACK (gtk_toolbar_tool_callback),
+                                  tool);
             }
             break;
 
@@ -528,11 +508,9 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
             gtk_widget_destroy( tool->m_item );
             break;
 
-#ifdef __WXGTK20__
         case wxTOOL_STYLE_SEPARATOR:
             gtk_toolbar_remove_space( m_toolbar, pos );
             break;
-#endif
     }
 
     InvalidateBestSize();
@@ -564,7 +542,7 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 
         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;
     }
@@ -595,11 +573,6 @@ void wxToolBar::SetMargins( int x, int y )
     wxCHECK_RET( GetToolsCount() == 0,
                  wxT("wxToolBar::SetMargins must be called before adding tools.") );
 
-#ifndef __WXGTK20__
-    if (x > 1)
-        gtk_toolbar_append_space( m_toolbar );  // oh well
-#endif
-
     m_xMargin = x;
     m_yMargin = y;
 }
@@ -607,7 +580,7 @@ void wxToolBar::SetMargins( int x, int y )
 void wxToolBar::SetToolSeparation( int separation )
 {
     // FIXME: this function disappeared
-#ifndef __WXGTK20__
+#if 0
     gtk_toolbar_set_space_size( m_toolbar, separation );
 #endif
 
@@ -683,15 +656,7 @@ void wxToolBar::OnInternalIdle()
 wxVisualAttributes
 wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-#ifdef __WXGTK20__
     return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
-#else
-    wxVisualAttributes attr;
-    GtkWidget* widget = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
-    attr = GetDefaultAttributesFromGTKWidget(widget);
-    gtk_widget_destroy(widget);
-    return attr;
-#endif
 }
 
 #endif // wxUSE_TOOLBAR_NATIVE