diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkenums.h | 4 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 4 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 26 | ||||
| -rw-r--r-- | gtk/gtkwidget.h | 6 |
4 files changed, 29 insertions, 11 deletions
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index 39d999b3ac..4efe82b773 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -81,8 +81,8 @@ typedef enum typedef enum { GTK_TEXT_DIR_NONE, - GTK_TEXT_DIR_RTL, - GTK_TEXT_DIR_LTR + GTK_TEXT_DIR_LTR, + GTK_TEXT_DIR_RTL } GtkTextDirection; /* justification for label and maybe other widgets (text?) */ diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 952c841347..a30676274e 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -742,12 +742,12 @@ gtk_main_do_event (GdkEvent *event) break; case GDK_EXPOSE: - if (event->any.window) + if (event->any.window && GTK_WIDGET_DOUBLE_BUFFERED (event_widget)) gdk_window_begin_paint_rect (event->any.window, &event->expose.area); gtk_widget_event (event_widget, event); - if (event->any.window) + if (event->any.window && GTK_WIDGET_DOUBLE_BUFFERED (event_widget)) gdk_window_end_paint (event->any.window); break; diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index dcb98970c6..474164dc82 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -1023,7 +1023,8 @@ gtk_widget_init (GtkWidget *widget) GTK_WIDGET_SET_FLAGS (widget, GTK_SENSITIVE | GTK_PARENT_SENSITIVE | - (composite_child_stack ? GTK_COMPOSITE_CHILD : 0)); + (composite_child_stack ? GTK_COMPOSITE_CHILD : 0) | + GTK_DOUBLE_BUFFERED); widget->style = gtk_widget_peek_style (); gtk_style_ref (widget->style); @@ -1859,7 +1860,7 @@ gtk_widget_draw (GtkWidget *widget, area = &temp_area; } - if (!GTK_WIDGET_NO_WINDOW (widget)) + if (!GTK_WIDGET_NO_WINDOW (widget) && GTK_WIDGET_DOUBLE_BUFFERED (widget)) { GdkRectangle tmp_area = *area; gint x, y; @@ -1876,7 +1877,7 @@ gtk_widget_draw (GtkWidget *widget, gtk_signal_emit (GTK_OBJECT (widget), widget_signals[DRAW], area); - if (!GTK_WIDGET_NO_WINDOW (widget)) + if (!GTK_WIDGET_NO_WINDOW (widget) && GTK_WIDGET_DOUBLE_BUFFERED (widget)) gdk_window_end_paint (widget->window); } } @@ -2802,6 +2803,19 @@ gtk_widget_set_app_paintable (GtkWidget *widget, } } +void +gtk_widget_set_double_buffered (GtkWidget *widget, + gboolean double_buffered) +{ + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_WIDGET (widget)); + + if (double_buffered) + GTK_WIDGET_SET_FLAGS (widget, GTK_DOUBLE_BUFFERED); + else + GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED); +} + /***************************************** * gtk_widget_set_sensitive: * @@ -3192,7 +3206,7 @@ gtk_widget_create_pango_context (GtkWidget *widget) PangoContext *context; char *lang, *p; - g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); context = gdk_pango_context_get (); @@ -3232,7 +3246,7 @@ gtk_widget_create_pango_layout (GtkWidget *widget) PangoLayout *layout; PangoContext *context; - g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); context = gtk_widget_create_pango_context (widget); layout = pango_layout_new (context); @@ -3998,7 +4012,7 @@ GtkTextDirection gtk_widget_get_direction (GtkWidget *widget) { g_return_val_if_fail (widget != NULL, GTK_TEXT_DIR_LTR); - g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_val_if_fail (GTK_IS_WIDGET (widget), GTK_TEXT_DIR_LTR); if (GTK_WIDGET_DIRECTION_SET (widget)) return GTK_WIDGET_DIRECTION_LTR (widget) ? GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL; diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 3d804a1371..8fae055e30 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -60,7 +60,8 @@ typedef enum GTK_COMPOSITE_CHILD = 1 << 17, GTK_NO_REPARENT = 1 << 18, GTK_APP_PAINTABLE = 1 << 19, - GTK_RECEIVES_DEFAULT = 1 << 20 + GTK_RECEIVES_DEFAULT = 1 << 20, + GTK_DOUBLE_BUFFERED = 1 << 21 } GtkWidgetFlags; /* Macro for casting a pointer to a GtkWidget or GtkWidgetClass pointer. @@ -101,6 +102,7 @@ typedef enum #define GTK_WIDGET_COMPOSITE_CHILD(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_COMPOSITE_CHILD) != 0) #define GTK_WIDGET_APP_PAINTABLE(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_APP_PAINTABLE) != 0) #define GTK_WIDGET_RECEIVES_DEFAULT(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_RECEIVES_DEFAULT) != 0) +#define GTK_WIDGET_DOUBLE_BUFFERED(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_DOUBLE_BUFFERED) != 0) /* Macros for setting and clearing widget flags. */ @@ -511,6 +513,8 @@ void gtk_widget_set_sensitive (GtkWidget *widget, gboolean sensitive); void gtk_widget_set_app_paintable (GtkWidget *widget, gboolean app_paintable); +void gtk_widget_set_double_buffered (GtkWidget *widget, + gboolean double_buffered); void gtk_widget_set_parent (GtkWidget *widget, GtkWidget *parent); void gtk_widget_set_parent_window (GtkWidget *widget, |