gtk+ r21550 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Sep 30 08:14:11 2008
New Revision: 21550
URL: http://svn.gnome.org/viewvc/gtk+?rev=21550&view=rev

Log:
2008-09-30  Michael Natterer  <mitch imendio com>

	Bug 541009 â Get rid of separate subclasses for horizontal and
	vertical orientation:

	* gtk/Makefile.am
	* gtk/gtk.symbols
	* gtk/gtk.h
	* gtk/gtkorientable.[ch]: add new interface GtkOrientable which
	will be implemented by everything that can switch orientation.



Added:
   trunk/gtk/gtkorientable.c
   trunk/gtk/gtkorientable.h
Modified:
   trunk/ChangeLog
   trunk/gtk/Makefile.am
   trunk/gtk/gtk.h
   trunk/gtk/gtk.symbols

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Tue Sep 30 08:14:11 2008
@@ -240,6 +240,7 @@
 	gtkmountoperation.h     \
 	gtknotebook.h		\
 	gtkobject.h		\
+	gtkorientable.h		\
 	gtkpagesetup.h		\
 	gtkpaned.h		\
 	gtkpapersize.h		\
@@ -498,6 +499,7 @@
 	gtkmountoperation.c     \
 	gtknotebook.c		\
 	gtkobject.c		\
+	gtkorientable.c		\
 	gtkpagesetup.c		\
 	gtkpaned.c		\
 	gtkpapersize.c		\

Modified: trunk/gtk/gtk.h
==============================================================================
--- trunk/gtk/gtk.h	(original)
+++ trunk/gtk/gtk.h	Tue Sep 30 08:14:11 2008
@@ -128,6 +128,7 @@
 #include <gtk/gtkmountoperation.h>
 #include <gtk/gtknotebook.h>
 #include <gtk/gtkobject.h>
+#include <gtk/gtkorientable.h>
 #include <gtk/gtkpagesetup.h>
 #include <gtk/gtkpapersize.h>
 #include <gtk/gtkpaned.h>

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Tue Sep 30 08:14:11 2008
@@ -2548,6 +2548,14 @@
 #endif
 #endif
 
+#if IN_HEADER(__GTK_ORIENTABLE_H__)
+#if IN_FILE(__GTK_ORIENTABLE_C__)
+gtk_orientable_get_type
+gtk_orientable_get_orientation
+gtk_orientable_set_orientation
+#endif
+#endif
+
 #if IN_HEADER(__GTK_OLD_EDITABLE_H__)
 #if IN_FILE(__GTK_OLD_EDITABLE_C__)
 gtk_old_editable_changed

Added: trunk/gtk/gtkorientable.c
==============================================================================
--- (empty file)
+++ trunk/gtk/gtkorientable.c	Tue Sep 30 08:14:11 2008
@@ -0,0 +1,129 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * gtkorientable.c
+ * Copyright (C) 2008 Imendio AB
+ * Contact: Michael Natterer <mitch imendio com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include "gtkorientable.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
+
+
+static void   gtk_orientable_base_init (GtkOrientableIface *iface);
+
+
+GType
+gtk_orientable_get_type (void)
+{
+  static GType orientable_type = 0;
+
+  if (! orientable_type)
+    {
+      const GTypeInfo orientable_info =
+      {
+        sizeof (GtkOrientableIface),
+        (GBaseInitFunc)     gtk_orientable_base_init,
+        (GBaseFinalizeFunc) NULL,
+      };
+
+      orientable_type = g_type_register_static (G_TYPE_INTERFACE,
+                                                I_("GtkOrientable"),
+                                                &orientable_info, 0);
+    }
+
+  return orientable_type;
+}
+
+static void
+gtk_orientable_base_init (GtkOrientableIface *iface)
+{
+  static gboolean initialized = FALSE;
+
+  if (initialized)
+    return;
+
+  /**
+   * GtkOrientable:orientation:
+   *
+   * The orientation of the orientable.
+   *
+   * Since: 2.16
+   **/
+  g_object_interface_install_property (iface,
+                                       g_param_spec_enum ("orientation",
+                                                          P_("Orientation"),
+                                                          P_("The orientation of the orientable"),
+                                                          GTK_TYPE_ORIENTATION,
+                                                          GTK_ORIENTATION_HORIZONTAL,
+                                                          GTK_PARAM_READWRITE));
+
+  initialized = TRUE;
+}
+
+/**
+ * gtk_orientable_set_orientation:
+ * @orientable: a #GtkOrientable
+ * @orientation: the orientable's new orientation.
+ *
+ * Sets the orientation of the @orientable.
+ *
+ * Since: 2.16
+ **/
+void
+gtk_orientable_set_orientation (GtkOrientable  *orientable,
+                                GtkOrientation  orientation)
+{
+  g_return_if_fail (GTK_IS_ORIENTABLE (orientable));
+
+  g_object_set (orientable,
+                "orientation", orientation,
+                NULL);
+}
+
+/**
+ * gtk_orientable_get_orientation:
+ * @orientable: a #GtkOrientable
+ *
+ * Retrieves the orientation of the @orientable.
+ *
+ * Return value: the orientation of the @orientable.
+ *
+ * Since: 2.16
+ **/
+GtkOrientation
+gtk_orientable_get_orientation (GtkOrientable *orientable)
+{
+  GtkOrientation orientation;
+
+  g_return_val_if_fail (GTK_IS_ORIENTABLE (orientable),
+                        GTK_ORIENTATION_HORIZONTAL);
+
+  g_object_get (orientable,
+                "orientation", &orientation,
+                NULL);
+
+  return orientation;
+}
+
+#define __GTK_ORIENTABLE_C__
+#include "gtkaliasdef.c"

Added: trunk/gtk/gtkorientable.h
==============================================================================
--- (empty file)
+++ trunk/gtk/gtkorientable.h	Tue Sep 30 08:14:11 2008
@@ -0,0 +1,60 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * gtkorientable.h
+ * Copyright (C) 2008 Imendio AB
+ * Contact: Michael Natterer <mitch imendio com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_ORIENTABLE_H__
+#define __GTK_ORIENTABLE_H__
+
+#include <gtk/gtkwidget.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_ORIENTABLE             (gtk_orientable_get_type ())
+#define GTK_ORIENTABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ORIENTABLE, GtkOrientable))
+#define GTK_ORIENTABLE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_ORIENTABLE, GtkOrientableIface))
+#define GTK_IS_ORIENTABLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ORIENTABLE))
+#define GTK_IS_ORIENTABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_ORIENTABLE))
+#define GTK_ORIENTABLE_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_ORIENTABLE, GtkOrientableIface))
+
+
+typedef struct _GtkOrientable       GtkOrientable;         /* Dummy typedef */
+typedef struct _GtkOrientableIface  GtkOrientableIface;
+
+struct _GtkOrientableIface
+{
+  GTypeInterface base_iface;
+};
+
+
+GType          gtk_orientable_get_type        (void) G_GNUC_CONST;
+
+void           gtk_orientable_set_orientation (GtkOrientable  *orientable,
+                                               GtkOrientation  orientation);
+GtkOrientation gtk_orientable_get_orientation (GtkOrientable  *orientable);
+
+G_END_DECLS
+
+#endif /* __GTK_ORIENTABLE_H__ */