diff options
| author | Timm Bäder <mail@baedert.org> | 2020-11-23 07:38:17 +0000 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2020-11-23 07:38:17 +0000 |
| commit | 47d572834b9b5997a020b066d833b823a284defd (patch) | |
| tree | 5dd6e323f58ce380580bc58e8a4d29a5bc952793 | |
| parent | 0abc7a336185920605c2f4f1b0c0b95dac567143 (diff) | |
| parent | 46601325f16abda5fee4f3eba890d65a0ef2c388 (diff) | |
| download | gtk+-47d572834b9b5997a020b066d833b823a284defd.tar.gz | |
Merge branch 'scalebutton' into 'master'wip/jimmac/sidebar-again
properly set ScaleButton's parent_class
Closes #3381
See merge request GNOME/gtk!2877
| -rw-r--r-- | gtk/gtkscalebutton.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h index 309e75eb65..67a479baac 100644 --- a/gtk/gtkscalebutton.h +++ b/gtk/gtkscalebutton.h @@ -38,7 +38,7 @@ #error "Only <gtk/gtk.h> can be included directly." #endif -#include <gtk/gtkbutton.h> +#include <gtk/gtkwidget.h> G_BEGIN_DECLS @@ -54,12 +54,12 @@ typedef struct _GtkScaleButtonClass GtkScaleButtonClass; struct _GtkScaleButton { - GtkButton parent_instance; + GtkWidget parent_instance; }; struct _GtkScaleButtonClass { - GtkButtonClass parent_class; + GtkWidgetClass parent_class; /* signals */ void (* value_changed) (GtkScaleButton *button, |