allow customization of individual grid lines appearance (patch 1496015)

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index bc01945de9bbae57d2861410b1a2cd809a531c1e..952ed022d6505a614e07a2b04228e2aa075552e4 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -10,11 +10,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/minifram.h"
-

 #if wxUSE_MINIFRAME
 
 #if wxUSE_MINIFRAME
 

-#include "wx/dcscreen.h"
+#include "wx/minifram.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcscreen.h"
+#endif

 
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"


@@ -46,12 +48,12 @@ static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h )
     x += org_x;
     y += org_y;
 
     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_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 );
-    g_object_unref (G_OBJECT (gc));
+    gdk_draw_rectangle( gdk_get_default_root_window(), gc, FALSE, x, y, w, h );
+    g_object_unref (gc);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -92,7 +94,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
                             3,
                             win->m_width - 7,
                             height+1 );
                             3,
                             win->m_width - 7,
                             height+1 );

-        g_object_unref (G_OBJECT (gc));
+        g_object_unref (gc);

 
         // Hack alert
         dc.m_window = pizza->bin_window;
 
         // Hack alert
         dc.m_window = pizza->bin_window;


@@ -167,7 +169,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 
     if (!win->m_isDragging) return TRUE;
 
 
     if (!win->m_isDragging) return TRUE;
 

-    win->m_isDragging = FALSE;
+    win->m_isDragging = false;

 
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;
 
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;


@@ -290,8 +292,8 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
                             );
 
         GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
                             );
 
         GtkWidget *pw = gtk_pixmap_new( pixmap, mask );

-        g_object_unref (G_OBJECT (mask));
-        g_object_unref (G_OBJECT (pixmap));
+        g_object_unref (mask);
+        g_object_unref (pixmap);

         gtk_widget_show( pw );
 
         GtkWidget *close_button = gtk_button_new();
         gtk_widget_show( pw );
 
         GtkWidget *close_button = gtk_button_new();


@@ -334,4 +336,4 @@ void wxMiniFrame::SetTitle( const wxString &title )
     gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );
 }
 
     gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );
 }
 

-#endif
+#endif // wxUSE_MINIFRAME