Commit f81607b3 authored by Vincent Geddes's avatar Vincent Geddes

- Added a private initialisation function `glade_init_check()' for

        * gladeui/glade.h, gladeui/glade-app.[ch]:
          - Added a private initialisation function `glade_init_check()' for
            libgladeui.
          - Removed the 'bad' public variables that defined various installation
            paths. These paths can now be obtained from static class methods on
            GladeApp (static as in the Java and C++ sense).        
        
        * src/main.c, src/glade-project-window.c, gladeui/glade-catalog.c,
          gladeui/glade-binding.c, gladeui/glade-cursor.c,
          gladeui/glade-palette.c gladeui/glade-widget-adaptor.c, 
          gladeui/glade-utils.c, bindings/python/glade-python.c: Use the new
          GladeApp methods for obtaining installation paths.
          
        * gladeui/glade-palette-box.[ch]: Use G_DEFINE_TYPE() and
          g_type_class_add_private().

svn path=/trunk/; revision=1090
parent 48d861d1
2007-02-06 Vincent Geddes <vincent.geddes@gmail.com>
2007-02-10 Vincent Geddes <vincent.geddes@gmail.com>
* src/main.c:
- Add summary of the application's functionality in the '--help'
......@@ -9,6 +9,22 @@
* data/glade-3.desktop.in.in: Added 'GUIDesigner' to 'Categories'.
* gladeui/glade.h, gladeui/glade-app.[ch]:
- Added a private initialisation function `glade_init_check()' for
libgladeui.
- Remove the 'bad' public variables that defined various installation
paths. These paths can now be obtained from static class methods on
GladeApp (static as in the Java and C++ sense).
* src/main.c, src/glade-project-window.c, gladeui/glade-catalog.c,
gladeui/glade-binding.c, gladeui/glade-cursor.c,
gladeui/glade-palette.c gladeui/glade-widget-adaptor.c,
gladeui/glade-utils.c, bindings/python/glade-python.c: Use the new
GladeApp methods for obtaining installation paths.
* gladeui/glade-palette-box.[ch]: Use G_DEFINE_TYPE() and
g_type_class_add_private().
2007-02-09 Juan Pablo Ugarte <juanpablougarte@gmail.com>
* gladeui/glade-utils.c: fixed bug in glade_util_have_devhelp()
......@@ -19,7 +35,7 @@
* bindings/python/glade-python-gwa.c: regenerated with pygtk-codegen-2.0
2007-02-06 Vincent Geddes <vincent.geddes@gmail.com>
2007-02-08 Vincent Geddes <vincent.geddes@gmail.com>
* gladeui/*.[ch]: Replaced C++ style comments with the more portable ISO C syntax.
......
......@@ -457,7 +457,7 @@ glade_binding_init (GladeBindingCtrl *ctrl)
/* Import glade module and set path */
command = g_strdup_printf ("import sys; import glade; sys.path+=['.', '%s'];\n",
glade_modules_dir);
glade_app_get_modules_dir ());
PyRun_SimpleString (command);
g_free (command);
......
......@@ -80,17 +80,19 @@ struct _GladeAppPrivate
static guint glade_app_signals[LAST_SIGNAL] = { 0 };
gchar *glade_scripts_dir = GLADE_SCRIPTSDIR;
gchar *glade_catalogs_dir = GLADE_CATALOGSDIR;
gchar *glade_modules_dir = GLADE_MODULESDIR;
gchar *glade_bindings_dir = GLADE_BINDINGSDIR;
gchar *glade_plugins_dir = GLADE_PLUGINSDIR;
gchar *glade_pixmaps_dir = GLADE_PIXMAPSDIR;
gchar *glade_locale_dir = GLADE_LOCALEDIR;
gboolean glade_verbose = FALSE;
/* installation paths */
static gchar *scripts_dir = NULL;
static gchar *catalogs_dir = NULL;
static gchar *modules_dir = NULL;
static gchar *bindings_dir = NULL;
static gchar *plugins_dir = NULL;
static gchar *pixmaps_dir = NULL;
static gchar *locale_dir = NULL;
static GladeApp *singleton_app = NULL;
static void glade_init_check (void);
G_DEFINE_TYPE (GladeApp, glade_app, G_TYPE_OBJECT);
......@@ -307,6 +309,106 @@ glade_app_config_load (GladeApp *app)
return config;
}
const gchar *
glade_app_get_scripts_dir (void)
{
glade_init_check ();
return scripts_dir;
}
const gchar *
glade_app_get_catalogs_dir (void)
{
glade_init_check ();
return catalogs_dir;
}
const gchar *
glade_app_get_modules_dir (void)
{
glade_init_check ();
return modules_dir;
}
const gchar *
glade_app_get_plugins_dir (void)
{
glade_init_check ();
return plugins_dir;
}
const gchar *
glade_app_get_pixmaps_dir (void)
{
glade_init_check ();
return pixmaps_dir;
}
const gchar *
glade_app_get_locale_dir (void)
{
glade_init_check ();
return locale_dir;
}
const gchar *
glade_app_get_bindings_dir (void)
{
glade_init_check ();
return bindings_dir;
}
/* build package paths at runtime */
static void
build_package_paths (void)
{
#ifdef G_OS_WIN32
gchar *prefix;
prefix = g_win32_get_package_installation_directory (NULL, NULL);
scripts_dir = g_build_filename (prefix, "share", PACKAGE, GLADE_BINDING_SCRIPT_DIR, NULL);
pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL);
modules_dir = g_build_filename (prefix, "lib", PACKAGE, "modules", NULL);
bindings_dir = g_build_filename (prefix, "lib", PACKAGE, "bindings", NULL);
locale_dir = g_build_filename (prefix, "share", "locale", NULL);
g_free (prefix);
#else
scripts_dir = g_strdup (GLADE_SCRIPTSDIR);
catalogs_dir = g_strdup (GLADE_CATALOGSDIR);
modules_dir = g_strdup (GLADE_MODULESDIR);
bindings_dir = g_strdup (GLADE_BINDINGSDIR);
plugins_dir = g_strdup (GLADE_PLUGINSDIR);
pixmaps_dir = g_strdup (GLADE_PIXMAPSDIR);
locale_dir = g_strdup (GLADE_LOCALEDIR);
#endif
}
/* initialization function for libgladeui (not GladeApp) */
static void
glade_init_check (void)
{
static gboolean initialised = FALSE;
if (initialised)
return;
build_package_paths ();
bindtextdomain (GETTEXT_PACKAGE, locale_dir);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
initialised = TRUE;
}
static void
glade_app_init (GladeApp *app)
{
......@@ -314,24 +416,10 @@ glade_app_init (GladeApp *app)
app->priv = GLADE_APP_GET_PRIVATE (app);
glade_init_check ();
if (!initialized)
{
#ifdef G_OS_WIN32
gchar *prefix;
prefix = g_win32_get_package_installation_directory (NULL, NULL);
glade_scripts_dir = g_build_filename (prefix, "share", PACKAGE, GLADE_BINDING_SCRIPT_DIR, NULL);
glade_pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
glade_catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL);
glade_modules_dir = g_build_filename (prefix, "lib", PACKAGE, "modules", NULL);
glade_bindings_dir = g_build_filename (prefix, "lib", PACKAGE, "bindings", NULL);
glade_locale_dir = g_build_filename (prefix, "share", "locale", NULL);
g_free (prefix);
#endif
bindtextdomain (GETTEXT_PACKAGE, glade_locale_dir);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
glade_cursor_init ();
glade_binding_load_all ();
......
......@@ -46,7 +46,7 @@ typedef struct _GladeAppClass GladeAppClass;
struct _GladeApp
{
/*< private >*/
GObject parent_instance;
GObject parent_instance;
GladeAppPrivate *priv;
};
......@@ -68,13 +68,13 @@ struct _GladeAppClass
};
LIBGLADEUI_API
GType glade_app_get_type (void) G_GNUC_CONST;
GType glade_app_get_type (void) G_GNUC_CONST;
LIBGLADEUI_API
GladeApp* glade_app_get (void);
GladeApp* glade_app_get (void);
LIBGLADEUI_API
void glade_app_update_ui (void);
void glade_app_update_ui (void);
LIBGLADEUI_API
gboolean glade_app_widget_event (GladeWidget *widget,
......@@ -156,21 +156,36 @@ GList *glade_app_get_selection (void);
* of multiple project logic.
*/
LIBGLADEUI_API
gboolean glade_app_is_selected (GObject *object);
gboolean glade_app_is_selected (GObject *object);
LIBGLADEUI_API
void glade_app_selection_set (GObject *object,
gboolean emit_signal);
void glade_app_selection_set (GObject *object,
gboolean emit_signal);
LIBGLADEUI_API
void glade_app_selection_add (GObject *object,
gboolean emit_signal);
void glade_app_selection_add (GObject *object,
gboolean emit_signal);
LIBGLADEUI_API
void glade_app_selection_remove (GObject *object,
gboolean emit_signal);
void glade_app_selection_remove (GObject *object,
gboolean emit_signal);
LIBGLADEUI_API
void glade_app_selection_clear (gboolean emit_signal);
void glade_app_selection_clear (gboolean emit_signal);
LIBGLADEUI_API
void glade_app_selection_changed(void);
void glade_app_selection_changed (void);
/* package paths */
LIBGLADEUI_API
const gchar *glade_app_get_scripts_dir (void) G_GNUC_CONST;
LIBGLADEUI_API
const gchar *glade_app_get_catalogs_dir (void) G_GNUC_CONST;
LIBGLADEUI_API
const gchar *glade_app_get_modules_dir (void) G_GNUC_CONST;
LIBGLADEUI_API
const gchar *glade_app_get_plugins_dir (void) G_GNUC_CONST;
LIBGLADEUI_API
const gchar *glade_app_get_pixmaps_dir (void) G_GNUC_CONST;
LIBGLADEUI_API
const gchar *glade_app_get_locale_dir (void) G_GNUC_CONST;
LIBGLADEUI_API
const gchar *glade_app_get_bindings_dir (void) G_GNUC_CONST;
G_END_DECLS
......
......@@ -175,7 +175,7 @@ glade_binding_load_all (void)
GDir *dir;
/* Read all files in bindings dir */
if ((dir = g_dir_open (glade_bindings_dir, 0, &error)) == NULL)
if ((dir = g_dir_open (glade_app_get_bindings_dir (), 0, &error)) == NULL)
{
g_warning ("Failed to open bindings directory: %s", error->message);
return;
......@@ -194,7 +194,7 @@ glade_binding_load_all (void)
if (g_str_has_suffix (filename, G_MODULE_SUFFIX) == FALSE)
continue;
path = g_build_filename (glade_bindings_dir, filename, NULL);
path = g_build_filename (glade_app_get_bindings_dir (), filename, NULL);
module = g_module_open (path, G_MODULE_BIND_LAZY);
if (module == NULL) continue;
......@@ -221,7 +221,7 @@ glade_binding_load_all (void)
glade_binding_classes_destroy);
/* datadir/package/scripts/ */
rootdir = g_build_filename (glade_scripts_dir, binding->ctrl.name, NULL);
rootdir = g_build_filename (glade_app_get_scripts_dir (), binding->ctrl.name, NULL);
glade_binding_script_load (binding, rootdir);
g_free (rootdir);
......
......@@ -441,7 +441,7 @@ glade_catalog_load_all (void)
GladeCatalog *catalog;
/* Read all files in catalog dir */
dir = g_dir_open (glade_catalogs_dir, 0, &error);
dir = g_dir_open (glade_app_get_catalogs_dir (), 0, &error);
if (!dir)
{
g_warning ("Failed to open catalog directory: %s",
......@@ -461,7 +461,7 @@ glade_catalog_load_all (void)
if (!g_str_has_suffix (filename, ".xml"))
continue;
catalog_filename = g_build_filename (glade_catalogs_dir,
catalog_filename = g_build_filename (glade_app_get_catalogs_dir (),
filename, NULL);
catalog = catalog_open (catalog_filename);
g_free (catalog_filename);
......
......@@ -177,7 +177,7 @@ glade_cursor_init (void)
cursor->add_widget_pixbuf = NULL;
/* load "add" cursor pixbuf */
path = g_build_filename (glade_pixmaps_dir, ADD_PIXBUF_FILENAME, NULL);
path = g_build_filename (glade_app_get_pixmaps_dir (), ADD_PIXBUF_FILENAME, NULL);
cursor->add_widget_pixbuf = gdk_pixbuf_new_from_file (path, &error);
......
......@@ -2,10 +2,9 @@
/*
* glade-palette-box.c
*
* Copyright (C) 2006 The Gnome Foundation.
* Copyright (C) 2007 Vincent Geddes.
*
* Authors:
* Vincent Geddes <vgeddes@metroweb.co.za>
* Author: Vincent Geddes <vincent.geddes@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -24,121 +23,86 @@
*
*/
#include "config.h"
#include <config.h>
#include "glade-palette-box.h"
#define GLADE_PALETTE_BOX_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),\
GLADE_TYPE_PALETTE_BOX, \
GladePaletteBoxPrivate))
static void glade_palette_box_class_init (GladePaletteBoxClass *klass);
static void glade_palette_box_init (GladePaletteBox *box);
static void glade_palette_box_add (GtkContainer *container, GtkWidget *widget);
static void glade_palette_box_remove (GtkContainer *container, GtkWidget *widget);
static GType glade_palette_box_child_type (GtkContainer *container);
static void glade_palette_box_size_request (GtkWidget *widget, GtkRequisition *requisition);
static void glade_palette_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
static void glade_palette_box_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
enum
{
PROP_0
};
static void glade_palette_box_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
enum
{
CHILD_PROP_0,
CHILD_PROP_POSITION
};
static void glade_palette_box_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
struct _GladePaletteBoxPrivate
{
GList *children;
static void glade_palette_box_set_child_property (GtkContainer *container,
GtkWidget *child,
guint property_id,
const GValue *value,
GParamSpec *pspec);
};
static void glade_palette_box_get_child_property (GtkContainer *container,
GtkWidget *child,
guint property_id,
GValue *value,
GParamSpec *pspec);
typedef struct
{
GtkWidget *widget;
} GladePaletteBoxChild;
static void glade_palette_box_add (GtkContainer *container, GtkWidget *widget);
static void glade_palette_box_remove (GtkContainer *container, GtkWidget *widget);
static GType glade_palette_box_child_type (GtkContainer *container);
static GtkContainerClass *parent_class = NULL;
static void glade_palette_box_size_request (GtkWidget *widget, GtkRequisition *requisition);
static void glade_palette_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
enum {
PROP_0
};
static void glade_palette_box_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
enum {
CHILD_PROP_0,
CHILD_PROP_POSITION
};
static void glade_palette_box_set_child_property (GtkContainer *container,
GtkWidget *child,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void glade_palette_box_get_child_property (GtkContainer *container,
GtkWidget *child,
guint property_id,
GValue *value,
GParamSpec *pspec);
GType
glade_palette_box_get_type (void)
{
static GType type = 0;
if (type == 0)
{
static const GTypeInfo info =
{
sizeof (GladePaletteBoxClass),
NULL,
NULL,
(GClassInitFunc) glade_palette_box_class_init,
NULL,
NULL,
sizeof (GladePaletteBox),
0,
(GInstanceInitFunc) glade_palette_box_init,
};
type = g_type_register_static (GTK_TYPE_CONTAINER,
"GladePaletteBox",
&info, 0);
}
G_DEFINE_TYPE (GladePaletteBox, glade_palette_box, GTK_TYPE_CONTAINER);
return type;
}
static void
glade_palette_box_class_init (GladePaletteBoxClass *klass)
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
parent_class = g_type_class_peek_parent (klass);
container_class = GTK_CONTAINER_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = glade_palette_box_set_property;
gobject_class->get_property = glade_palette_box_get_property;
widget_class->size_request = glade_palette_box_size_request;
widget_class->size_allocate = glade_palette_box_size_allocate;
container_class = GTK_CONTAINER_CLASS (klass);
container_class->add = glade_palette_box_add;
container_class->remove = glade_palette_box_remove;
container_class->forall = glade_palette_box_forall;
container_class->child_type = glade_palette_box_child_type;
container_class->add = glade_palette_box_add;
container_class->remove = glade_palette_box_remove;
container_class->forall = glade_palette_box_forall;
container_class->child_type = glade_palette_box_child_type;
container_class->set_child_property = glade_palette_box_set_child_property;
container_class->get_child_property = glade_palette_box_get_child_property;
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->size_request = glade_palette_box_size_request;
widget_class->size_allocate = glade_palette_box_size_allocate;
gtk_container_class_install_child_property (container_class,
CHILD_PROP_POSITION,
g_param_spec_int ("position",
......@@ -146,7 +110,8 @@ glade_palette_box_class_init (GladePaletteBoxClass *klass)
"The index of the child in the parent",
-1, G_MAXINT, 0,
G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (GladePaletteBoxPrivate));
}
static void
......@@ -155,43 +120,9 @@ glade_palette_box_init (GladePaletteBox *box)
GTK_WIDGET_SET_FLAGS (box, GTK_NO_WINDOW);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), FALSE);
box->children = NULL;
}
box->priv = GLADE_PALETTE_BOX_GET_PRIVATE (box);
static void
glade_palette_box_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GladePaletteBox *box;
box = GLADE_PALETTE_BOX (object);
switch (prop_id)
{
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
glade_palette_box_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GladePaletteBox *box;
box = GLADE_PALETTE_BOX (object);
switch (prop_id)
{
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
box->priv->children = NULL;
}
static void
......@@ -229,7 +160,7 @@ glade_palette_box_get_child_property (GtkContainer *container,
{
case CHILD_PROP_POSITION:
i = 0;
for (list = GLADE_PALETTE_BOX (container)->children; list; list = list->next)
for (list = GLADE_PALETTE_BOX_GET_PRIVATE (container)->children; list; list = list->next)
{
GladePaletteBoxChild *child_entry;
......@@ -246,22 +177,12 @@ glade_palette_box_get_child_property (GtkContainer *container,
}
}
GtkWidget*
glade_palette_box_new (void)
{
GladePaletteBox *box;
box = g_object_new (GLADE_TYPE_PALETTE_BOX, NULL);
return GTK_WIDGET (box);
}
/* do some badass mathematics */
static gint
calculate_children_width_allocation (GtkWidget *widget,
GtkAllocation *allocation,
calculate_children_width_allocation (GtkWidget *widget,
GtkAllocation *allocation,
GtkRequisition *child_requisition,
gint nvis_children)
gint nvis_children)
{
gint w; /* container width */
gint cw; /* children width request */
......@@ -297,7 +218,7 @@ glade_palette_box_size_request (GtkWidget *widget, GtkRequisition *requisition)
child_requisition.width = 0;
child_requisition.height = 0;
for (l = box->children; l; l = l->next)
for (l = box->priv->children; l; l = l->next)
{
child = (GladePaletteBoxChild *) (l->data);
......@@ -342,7 +263,7 @@ glade_palette_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
child_requisition.height = 0;
/* Retrieve maximum requisition from children */
for (l = box->children; l; l = l->next)
for (l = box->priv->children; l; l = l->next)
{
child = (GladePaletteBoxChild *) (l->data);
......@@ -370,7 +291,7 @@ glade_palette_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
nvis_children);
/* Allocate real estate to children */
for (l = box->children; l; l = l->next)
for (l = box->priv->children; l; l = l->next)
{
child = (GladePaletteBoxChild *) (l->data);
gint horizontal_space_remaining;
......@@ -418,9 +339,9 @@ glade_palette_box_add (GtkContainer *container, GtkWidget *widget)
box = GLADE_PALETTE_BOX (container);
child = g_new (GladePaletteBoxChild, 1);
child = g_slice_new (GladePaletteBoxChild);
child->widget = widget;
box->children = g_list_append (box->children, child);
box->priv->children = g_list_append (box->priv->children, child);
gtk_widget_set_parent (widget, GTK_WIDGET (box));
......@@ -438,7 +359,7 @@ glade_palette_box_remove (GtkContainer *container, GtkWidget *widget)
box = GLADE_PALETTE_BOX (container);
children = box->children;
children = box->priv->children;
while (children != NULL)
{
child = children->data;
......@@ -452,8 +373,9 @@ glade_palette_box_remove (GtkContainer *container, GtkWidget *widget)
gtk_widget_unparent (widget);
box->children = g_list_remove (box->children, child);
g_free (child);
box->priv->children = g_list_remove (box->priv->children, child);
g_slice_free (GladePaletteBoxChild, child);
if (was_visible)
gtk_widget_queue_resize (GTK_WIDGET (container));
......@@ -478,7 +400,7 @@ glade_palette_box_forall (GtkContainer *container,
box = GLADE_PALETTE_BOX (container);
children = box->children;
children = box->priv->children;
while (children != NULL)
{
child = children->data;
......@@ -501,7 +423,7 @@ glade_palette_box_reorder_child (GladePaletteBox *box,
g_return_if_fail (GLADE_IS_PALETTE_BOX (box));
g_return_if_fail (GTK_IS_WIDGET (child));
old_link = box->children;
old_link = box->priv->children;
old_position = 0;
while (old_link)
{
......@@ -518,14 +440,14 @@ glade_palette_box_reorder_child (GladePaletteBox *box,
if (position == old_position)
return;
box->children = g_list_delete_link (box->children, old_link);
box->priv->children = g_list_delete_link (box->priv->children, old_link);
if (position < 0)
new_link = NULL;
else
new_link = g_list_nth (box->children, position);
new_link = g_list_nth (box->priv->children, position);
box->children = g_list_insert_before (box->children, new_link, child_info);
box->priv->children = g_list_insert_before (box->priv->children, new_link, child_info);
gtk_widget_child_notify (child, "position");
if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
......@@ -537,3 +459,9 @@ glade_palette_box_child_type (GtkContainer *container)
{
return GTK_TYPE_WIDGET;
}
GtkWidget*
glade_palette_box_new (void)
{
return g_object_new (GLADE_TYPE_PALETTE_BOX, NULL);
}
......@@ -2,10 +2,9 @@
/*
* glade-palette-box.h
*
* Copyright (C) 2006 The Gnome Foundation.
* Copyright (C) 2007 Vincent Geddes.
*
* Authors:
* Vincent Geddes <vgeddes@metroweb.co.za>
* Author: Vincent Geddes <vincent.geddes@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -27,7 +26,6 @@
#ifndef __GLADE_PALETTE_BOX_H__
#define __GLADE_PALETTE_BOX_H__
#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
G_BEGIN_DECLS
......@@ -40,15 +38,15 @@ G_BEGIN_DECLS
#define GLADE_PALETTE_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_PALETTE_BOX, GladePaletteBoxClass))
typedef struct _GladePaletteBox GladePaletteBox;
typedef struct _GladePaletteBoxPrivate GladePaletteBoxPrivate;
typedef struct _GladePaletteBoxClass GladePaletteBoxClass;
typedef struct _GladePaletteBoxChild GladePaletteBoxChild;
struct _GladePaletteBox
{
GtkContainer container;
/*< private >*/
GtkContainer parent_instance;