fix for non precomp

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 3e4e04231f2d458c11ae5a690515bc22e6a9f7a3..f209407663b76c0b1ee58fed9dddcad40490ad8a 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
 //-----------------------------------------------------------------------------
@@ -75,12 +68,13 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 
     GtkPizza *pizza = GTK_PIZZA(widget);
 
-    gtk_draw_shadow( widget->style,
-                     pizza->bin_window,
-                     GTK_STATE_NORMAL,
-                     GTK_SHADOW_OUT,
-                     0, 0,
-                     win->m_width, win->m_height );
+    gtk_paint_shadow (widget->style,
+                      pizza->bin_window,
+                      GTK_STATE_NORMAL,
+                      GTK_SHADOW_OUT,
+                      NULL, NULL, NULL, // FIXME: No clipping?
+                      0, 0,
+                      win->m_width, win->m_height);
 
     if (!win->GetTitle().empty() &&
         ((win->GetWindowStyle() & wxCAPTION) ||
@@ -108,54 +102,6 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 }
 }
 
-//-----------------------------------------------------------------------------
-// "draw" of m_mainWidget
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__
-extern "C" {
-static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-
-    GtkPizza *pizza = GTK_PIZZA(widget);
-
-    gtk_draw_shadow( widget->style,
-                     pizza->bin_window,
-                     GTK_STATE_NORMAL,
-                     GTK_SHADOW_OUT,
-                     0, 0,
-                     win->m_width, win->m_height );
-
-    if (!win->GetTitle().empty() &&
-        ((win->GetWindowStyle() & wxCAPTION) ||
-         (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
-         (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
-    {
-        wxClientDC dc(win);
-        dc.SetFont( *wxSMALL_FONT );
-        int height = dc.GetCharHeight();
-
-        GdkGC *gc = gdk_gc_new( pizza->bin_window );
-        gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
-        gdk_draw_rectangle( pizza->bin_window, gc, TRUE,
-                            3,
-                            3,
-                            win->m_width - 7,
-                            height+1 );
-        gdk_gc_unref( gc );
-
-        // Hack alert
-        dc.m_window = pizza->bin_window;
-        dc.SetTextForeground( *wxWHITE );
-        dc.DrawText( win->GetTitle(), 6, 3 );
-    }
-}
-}
-#endif
-
 //-----------------------------------------------------------------------------
 // "button_press_event" of m_mainWidget
 //-----------------------------------------------------------------------------
@@ -235,7 +181,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
     y += org_y - win->m_diffY;
     win->m_x = x;
     win->m_y = y;
-    gtk_widget_set_uposition( win->m_widget, x, y );
+    gtk_window_move( GTK_WINDOW(win->m_widget), x, y );
 
     return TRUE;
 }
@@ -295,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)
@@ -363,6 +295,10 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
         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),
@@ -371,28 +307,22 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 
         gtk_widget_show( close_button );
 
-        gtk_signal_connect( GTK_OBJECT(close_button), "clicked",
-          GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+        g_signal_connect (close_button, "clicked",
+                          G_CALLBACK (gtk_button_clicked_callback),
+                          this);
     }
 
     /* these are called when the borders are drawn */
-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
-        GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
-
-#ifndef __WXGTK20__
-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
-       GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
-#endif
+    g_signal_connect (m_mainWidget, "expose_event",
+                      G_CALLBACK (gtk_window_own_expose_callback), this );
 
     /* these are required for dragging the mini frame around */
-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_press_event",
-      GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this );
-
-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_release_event",
-      GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this );
-
-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event",
-      GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
+    g_signal_connect (m_mainWidget, "button_press_event",
+                      G_CALLBACK (gtk_window_button_press_callback), this);
+    g_signal_connect (m_mainWidget, "button_release_event",
+                      G_CALLBACK (gtk_window_button_release_callback), this);
+    g_signal_connect (m_mainWidget, "motion_notify_event",
+                      G_CALLBACK (gtk_window_motion_notify_callback), this);
 
     return true;
 }
@@ -401,11 +331,7 @@ void wxMiniFrame::SetTitle( const wxString &title )
 {
     wxFrame::SetTitle( title );
 
-#ifdef __WXGTK20__
     gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );
-#else
-    gtk_widget_draw( m_mainWidget, (GdkRectangle*) NULL );
-#endif
 }
 
 #endif