Commit ee3ea1b3 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

Bug 541009 – Get rid of separate subclasses for horizontal and vertical

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.


svn path=/trunk/; revision=21550
parent 885dd3ef
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.
2008-09-30 Christian Dywan <christian@imendio.com>
Fix a typo in the tutorial.
......
......@@ -240,6 +240,7 @@ gtk_public_h_sources = \
gtkmountoperation.h \
gtknotebook.h \
gtkobject.h \
gtkorientable.h \
gtkpagesetup.h \
gtkpaned.h \
gtkpapersize.h \
......@@ -498,6 +499,7 @@ gtk_base_c_sources = \
gtkmountoperation.c \
gtknotebook.c \
gtkobject.c \
gtkorientable.c \
gtkpagesetup.c \
gtkpaned.c \
gtkpapersize.c \
......
......@@ -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>
......
......@@ -2548,6 +2548,14 @@ gtk_object_get_type G_GNUC_CONST
#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
......
/* 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"
/* 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__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment