[gimp/gtk3-port: 82/247] app: port to GtkWidget::draw() but disable the code inside with #if 0



commit 9b2554e16e9c1c3818a6899a60991f809e153d2c
Author: Michael Natterer <mitch gimp org>
Date:   Tue Oct 19 20:09:22 2010 +0200

    app: port to GtkWidget::draw() but disable the code inside with #if 0

 app/widgets/gimpcombotagentry.c |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/app/widgets/gimpcombotagentry.c b/app/widgets/gimpcombotagentry.c
index ac06bc0..0b5a26b 100644
--- a/app/widgets/gimpcombotagentry.c
+++ b/app/widgets/gimpcombotagentry.c
@@ -41,8 +41,8 @@
 static void     gimp_combo_tag_entry_constructed       (GObject                *object);
 static void     gimp_combo_tag_entry_dispose           (GObject                *object);
 
-static gboolean gimp_combo_tag_entry_expose            (GtkWidget              *widget,
-                                                        GdkEventExpose         *event);
+static gboolean gimp_combo_tag_entry_draw              (GtkWidget              *widget,
+                                                        cairo_t                *cr);
 static void     gimp_combo_tag_entry_style_set         (GtkWidget              *widget,
                                                         GtkStyle               *previous_style);
 
@@ -51,7 +51,7 @@ static void     gimp_combo_tag_entry_icon_press        (GtkWidget              *
                                                         GdkEvent               *event,
                                                         gpointer                user_data);
 
-static void     gimp_combo_tag_entry_popup_destroy     (GtkObject              *object,
+static void     gimp_combo_tag_entry_popup_destroy     (GtkWidget              *widget,
                                                         GimpComboTagEntry      *entry);
 
 static void     gimp_combo_tag_entry_tag_count_changed (GimpFilteredContainer  *container,
@@ -70,11 +70,11 @@ gimp_combo_tag_entry_class_init (GimpComboTagEntryClass *klass)
   GObjectClass   *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  object_class->constructed  = gimp_combo_tag_entry_constructed;
-  object_class->dispose      = gimp_combo_tag_entry_dispose;
+  object_class->constructed = gimp_combo_tag_entry_constructed;
+  object_class->dispose     = gimp_combo_tag_entry_dispose;
 
-  widget_class->expose_event = gimp_combo_tag_entry_expose;
-  widget_class->style_set    = gimp_combo_tag_entry_style_set;
+  widget_class->draw        = gimp_combo_tag_entry_draw;
+  widget_class->style_set   = gimp_combo_tag_entry_style_set;
 }
 
 static void
@@ -145,13 +145,14 @@ gimp_combo_tag_entry_dispose (GObject *object)
 }
 
 static gboolean
-gimp_combo_tag_entry_expose (GtkWidget      *widget,
-                             GdkEventExpose *event)
+gimp_combo_tag_entry_draw (GtkWidget *widget,
+                           cairo_t   *cr)
 {
   GimpComboTagEntry *entry = GIMP_COMBO_TAG_ENTRY (widget);
 
   if (! entry->arrow_pixbuf)
     {
+#if 0
       GtkStyle  *style = gtk_widget_get_style (widget);
       GdkPixmap *pixmap;
       cairo_t   *cr;
@@ -177,9 +178,10 @@ gimp_combo_tag_entry_expose (GtkWidget      *widget,
       gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry),
                                       GTK_ENTRY_ICON_SECONDARY,
                                       entry->arrow_pixbuf);
+#endif
     }
 
-  return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+  return GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
 }
 
 static void
@@ -291,7 +293,7 @@ gimp_combo_tag_entry_icon_press (GtkWidget            *widget,
 }
 
 static void
-gimp_combo_tag_entry_popup_destroy (GtkObject         *object,
+gimp_combo_tag_entry_popup_destroy (GtkWidget         *widget,
                                     GimpComboTagEntry *entry)
 {
   entry->popup = NULL;



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