Implemented Mac-style button toggling within wxButtonToolBar, and line

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 27d3ec2e4ae2f9063bff887f6c3bec55362ad7ae..2e55af6f5357df2b298c8e53366aba97f2b83ed2 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -24,13 +24,6 @@
 #include <gdk/gdkprivate.h>
 #include <gdk/gdkx.h>
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -53,12 +46,12 @@ static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h )
     x += org_x;
     y += org_y;
 
-    GdkGC *gc = gdk_gc_new( GDK_ROOT_PARENT() );
+    GdkGC *gc = gdk_gc_new( gdk_get_default_root_window() );
     gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS );
     gdk_gc_set_function( gc, GDK_INVERT );
 
-    gdk_draw_rectangle( GDK_ROOT_PARENT(), gc, FALSE, x, y, w, h );
-    gdk_gc_unref( gc );
+    gdk_draw_rectangle( gdk_get_default_root_window(), gc, FALSE, x, y, w, h );
+    g_object_unref (G_OBJECT (gc));
 }
 
 //-----------------------------------------------------------------------------
@@ -99,7 +92,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
                             3,
                             win->m_width - 7,
                             height+1 );
-        gdk_gc_unref( gc );
+        g_object_unref (G_OBJECT (gc));
 
         // Hack alert
         dc.m_window = pizza->bin_window;
@@ -248,29 +241,15 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFram
 
 static const char *cross_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"5 5 16 1",
-"  c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c None",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
+"5 5 2 1",
+"# c Gray0",
+"  c None",
 /* pixels */
-" ### ",
-"# # #",
-"## ##",
-"# # #",
-" ### ",
+"#   #",
+" # # ",
+"  #  ",
+" # # ",
+"#   #",
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
@@ -311,11 +290,15 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
                             );
 
         GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
-        gdk_bitmap_unref( mask );
-        gdk_pixmap_unref( pixmap );
+        g_object_unref (G_OBJECT (mask));
+        g_object_unref (G_OBJECT (pixmap));
         gtk_widget_show( pw );
 
         GtkWidget *close_button = gtk_button_new();
+#ifdef __WXGTK24__
+        if (!gtk_check_version(2,4,0))
+            gtk_button_set_focus_on_click( GTK_BUTTON(close_button), FALSE );
+#endif
         gtk_container_add( GTK_CONTAINER(close_button), pw );
 
         gtk_pizza_put( GTK_PIZZA(m_mainWidget),