[gtk+] GtkColorSel: derive from GtkBox, not GtkVBox
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkColorSel: derive from GtkBox, not GtkVBox
- Date: Tue, 7 Jun 2011 22:39:47 +0000 (UTC)
commit 5df02faa5f91d39847e74aed2694af292a2c05aa
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jun 7 18:34:34 2011 -0400
GtkColorSel: derive from GtkBox, not GtkVBox
gtk/gtkcolorsel.c | 6 +++++-
gtk/gtkcolorsel.h | 6 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 0298498..7f9a1f0 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -33,6 +33,7 @@
#include <string.h>
#include "gdk/gdk.h"
+#include "gtkorientable.h"
#include "gtkhsv.h"
#include "gtkwindow.h"
#include "gtkselection.h"
@@ -298,7 +299,7 @@ static const guchar dropper_bits[] = {
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
-G_DEFINE_TYPE (GtkColorSelection, gtk_color_selection, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GtkColorSelection, gtk_color_selection, GTK_TYPE_BOX)
static void
gtk_color_selection_class_init (GtkColorSelectionClass *klass)
@@ -394,6 +395,9 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
AtkObject *atk_obj;
GList *focus_chain = NULL;
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (colorsel),
+ GTK_ORIENTATION_VERTICAL);
+
gtk_widget_push_composite_child ();
priv = colorsel->private_data = G_TYPE_INSTANCE_GET_PRIVATE (colorsel, GTK_TYPE_COLOR_SELECTION, GtkColorSelectionPrivate);
diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index 7d5d85f..0dbdae1 100644
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -33,7 +33,7 @@
#define __GTK_COLOR_SELECTION_H__
#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtkbox.h>
G_BEGIN_DECLS
@@ -66,7 +66,7 @@ typedef void (* GtkColorSelectionChangePaletteWithScreenFunc) (GdkScreen
struct _GtkColorSelection
{
- GtkVBox parent_instance;
+ GtkBox parent_instance;
/* < private_data > */
GtkColorSelectionPrivate *private_data;
@@ -74,7 +74,7 @@ struct _GtkColorSelection
struct _GtkColorSelectionClass
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
void (*color_changed) (GtkColorSelection *color_selection);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]