cleanup - reformatting; simplified OnPaint

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 76a7e8d4992a7d7a6d2a203fdd2203114bd5b7fc..48acb9a499069a95c62b177b871bfe7429c4d268 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -75,12 +75,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) ||
@@ -187,7 +188,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;
 }
@@ -247,29 +248,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)
@@ -315,6 +302,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),