[dia] Don't use deprecated function gdk_draw_pixmap().



commit 97423c9aab06229fa86731060b6e67dfcf93d994
Author: Adam Buchbinder <adam buchbinder gmail com>
Date:   Mon May 4 12:34:45 2009 -0400

    Don't use deprecated function gdk_draw_pixmap().
    
    Replaced gdk_draw_pixmap() with gdk_draw_drawable():
    http://library.gnome.org/devel/gdk/stable/gdk-Drawing-Primitives.html#gdk-draw-pixmap
    
    Signed-off-by: Adam Buchbinder <adam buchbinder gmail com>
    Signed-off-by: Hans Breuer <hans breuer org>
---
 app/linewidth_area.c                  |    4 ++--
 app/navigation.c                      |   20 ++++++++++----------
 app/render_gdk.c                      |   12 ++++++------
 plug-ins/cairo/diacairo-interactive.c |   12 ++++++------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/linewidth_area.c b/app/linewidth_area.c
index 2b38bcf..ebe4526 100644
--- a/app/linewidth_area.c
+++ b/app/linewidth_area.c
@@ -111,8 +111,8 @@ linewidth_area_draw (GtkWidget *linewidth_area)
 		      active_linewidth+4, height-1);
   }
 
-  gdk_draw_pixmap (linewidth_area->window, linewidth_area_gc, linewidth_area_pixmap,
-		   0, 0, 0, 0, width, height);
+  gdk_draw_drawable (linewidth_area->window, linewidth_area_gc, linewidth_area_pixmap,
+		     0, 0, 0, 0, width, height);
 }
 
 static gint
diff --git a/app/navigation.c b/app/navigation.c
index 6b9340b..8d0abf0 100644
--- a/app/navigation.c
+++ b/app/navigation.c
@@ -311,12 +311,12 @@ static gboolean
 on_da_expose_event (GtkWidget * widget, GdkEventExpose * event, gpointer unused)
 {
   /*refresh the part outdated by the event*/
-  gdk_draw_pixmap (widget->window,
-                   widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-                   GDK_PIXMAP(nav->buffer),
-                   event->area.x, event->area.y,
-                   event->area.x, event->area.y,
-                   event->area.width, event->area.height);
+  gdk_draw_drawable (widget->window,
+                     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                     GDK_PIXMAP(nav->buffer),
+                     event->area.x, event->area.y,
+                     event->area.x, event->area.y,
+                     event->area.width, event->area.height);
 
   /*the first time, display the current display's state*/
   if(nav->is_first_expose){
@@ -393,10 +393,10 @@ on_da_motion_notify_event (GtkWidget * drawing_area, GdkEventMotion * event, gpo
 
 /*--Draw the miniframe*/
 /*refresh from the buffer*/
-  gdk_draw_pixmap (drawing_area->window,
-                   drawing_area->style->fg_gc[GTK_WIDGET_STATE (drawing_area)],
-                   GDK_PIXMAP(nav->buffer),
-                   0, 0, 0, 0, nav->width, nav->height);
+  gdk_draw_drawable (drawing_area->window,
+                     drawing_area->style->fg_gc[GTK_WIDGET_STATE (drawing_area)],
+                     GDK_PIXMAP(nav->buffer),
+                     0, 0, 0, 0, nav->width, nav->height);
 /*draw directly on the window, do not buffer the miniframe*/
   gdk_draw_rectangle (drawing_area->window,
                       nav->gc, FALSE,
diff --git a/app/render_gdk.c b/app/render_gdk.c
index a96f54f..26d1d84 100644
--- a/app/render_gdk.c
+++ b/app/render_gdk.c
@@ -129,12 +129,12 @@ copy_to_window (DiaRenderer *object, gpointer window,
   if (!copy_gc)
     copy_gc = gdk_gc_new(window);
 
-  gdk_draw_pixmap (GDK_WINDOW(window),
-                   copy_gc,
-                   renderer->pixmap,
-                   x, y,
-                   x, y,
-                   width, height);
+  gdk_draw_drawable (GDK_WINDOW(window),
+                     copy_gc,
+                     renderer->pixmap,
+                     x, y,
+                     x, y,
+                     width, height);
 }
 
 static void
diff --git a/plug-ins/cairo/diacairo-interactive.c b/plug-ins/cairo/diacairo-interactive.c
index 3888280..e530b7e 100644
--- a/plug-ins/cairo/diacairo-interactive.c
+++ b/plug-ins/cairo/diacairo-interactive.c
@@ -353,12 +353,12 @@ copy_to_window (DiaRenderer *object, gpointer window,
   if (!copy_gc)
     copy_gc = gdk_gc_new(window);
 
-  gdk_draw_pixmap (GDK_WINDOW(window),
-                   copy_gc,
-                   renderer->pixmap,
-                   x, y,
-                   x, y,
-                   width > 0 ? width : -width, height > 0 ? height : -height);
+  gdk_draw_drawable (GDK_WINDOW(window),
+                     copy_gc,
+                     renderer->pixmap,
+                     x, y,
+                     x, y,
+                     width > 0 ? width : -width, height > 0 ? height : -height);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]