GTK2: gtk_draw_* -> gtk_paint_*

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 76a7e8d4992a7d7a6d2a203fdd2203114bd5b7fc..d86921e0e67ed98391e40e8c5d09b28b7fb1cf15 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) ||

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 919447b0819129d17505b3f7872c3374692ac073..fe8da3d23aab6eea1b0ece098361ec0bdae236f1 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -358,23 +358,25 @@ static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
 
     if (win->HasFlag(wxRAISED_BORDER))
     {
-        gtk_draw_shadow( widget->style,
-                         widget->window,
-                         GTK_STATE_NORMAL,
-                         GTK_SHADOW_OUT,
-                         dx, dy,
-                         widget->allocation.width-dw, widget->allocation.height-dh );
+        gtk_paint_shadow (widget->style,
+                          widget->window,
+                          GTK_STATE_NORMAL,
+                          GTK_SHADOW_OUT,
+                          NULL, NULL, NULL, // FIXME: No clipping?
+                          dx, dy,
+                          widget->allocation.width-dw, widget->allocation.height-dh );
         return;
     }
 
     if (win->HasFlag(wxSUNKEN_BORDER))
     {
-        gtk_draw_shadow( widget->style,
-                         widget->window,
-                         GTK_STATE_NORMAL,
-                         GTK_SHADOW_IN,
-                         dx, dy,
-                         widget->allocation.width-dw, widget->allocation.height-dh );
+        gtk_paint_shadow (widget->style,
+                          widget->window,
+                          GTK_STATE_NORMAL,
+                          GTK_SHADOW_IN,
+                          NULL, NULL, NULL, // FIXME: No clipping?
+                          dx, dy,
+                          widget->allocation.width-dw, widget->allocation.height-dh );
         return;
     }