Commit 7399ad1a authored by Johannes Schmid's avatar Johannes Schmid
Browse files

Remove gdl-tools.h with deprecated libgnome macros and use glib macros instead

parent b3eecbce
......@@ -22,7 +22,6 @@ CLEANFILES = \
libgdl_headers = \
gdl.h \
gdl-tools.h \
gdl-dock.h \
gdl-dock-object.h \
gdl-dock-master.h \
......
......@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#include "gdl-tools.h"
#include "gdl-dock.h"
#include "gdl-dock-master.h"
#include "gdl-dock-bar.h"
......@@ -42,7 +41,6 @@ enum {
/* ----- Private prototypes ----- */
static void gdl_dock_bar_class_init (GdlDockBarClass *klass);
static void gdl_dock_bar_instance_init (GdlDockBar *dockbar);
static void gdl_dock_bar_get_property (GObject *object,
guint prop_id,
......@@ -71,7 +69,7 @@ struct _GdlDockBarPrivate {
/* ----- Private functions ----- */
GDL_CLASS_BOILERPLATE (GdlDockBar, gdl_dock_bar, GtkBox, GTK_TYPE_BOX)
G_DEFINE_TYPE (GdlDockBar, gdl_dock_bar, GTK_TYPE_BOX)
static void gdl_dock_bar_size_request (GtkWidget *widget,
GtkRequisition *requisition );
......@@ -124,7 +122,7 @@ gdl_dock_bar_class_init (GdlDockBarClass *klass)
}
static void
gdl_dock_bar_instance_init (GdlDockBar *dockbar)
gdl_dock_bar_init (GdlDockBar *dockbar)
{
dockbar->_priv = g_new0 (GdlDockBarPrivate, 1);
dockbar->_priv->master = NULL;
......@@ -209,7 +207,7 @@ gdl_dock_bar_destroy (GtkObject *object)
g_free (priv);
}
GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
GTK_OBJECT_CLASS (gdl_dock_bar_parent_class)->destroy (object);
}
static void
......
......@@ -23,13 +23,12 @@
#include "gdl-dock-item-button-image.h"
#include <math.h>
#include "gdl-tools.h"
#define ICON_SIZE 12
GDL_CLASS_BOILERPLATE (GdlDockItemButtonImage,
gdl_dock_item_button_image,
GtkWidget, GTK_TYPE_WIDGET);
G_DEFINE_TYPE (GdlDockItemButtonImage,
gdl_dock_item_button_image,
GTK_TYPE_WIDGET);
static gint
gdl_dock_item_button_image_expose (GtkWidget *widget,
......@@ -115,7 +114,7 @@ gdl_dock_item_button_image_expose (GtkWidget *widget,
}
static void
gdl_dock_item_button_image_instance_init (
gdl_dock_item_button_image_init (
GdlDockItemButtonImage *button_image)
{
gtk_widget_set_has_window (GTK_WIDGET (button_image), FALSE);
......@@ -140,8 +139,6 @@ gdl_dock_item_button_image_class_init (
GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
widget_class->expose_event =
gdl_dock_item_button_image_expose;
widget_class->size_request =
......
......@@ -39,7 +39,6 @@
#include "gdl-dock-item-grip.h"
#include "gdl-dock-item-button-image.h"
#include "gdl-switcher.h"
#include "gdl-tools.h"
#define ALIGN_BORDER 5
#define DRAG_HANDLE_SIZE 10
......@@ -58,8 +57,7 @@ struct _GdlDockItemGripPrivate {
gboolean handle_shown;
};
GDL_CLASS_BOILERPLATE (GdlDockItemGrip, gdl_dock_item_grip,
GtkContainer, GTK_TYPE_CONTAINER);
G_DEFINE_TYPE (GdlDockItemGrip, gdl_dock_item_grip, GTK_TYPE_CONTAINER);
GtkWidget*
gdl_dock_item_create_label_widget(GdlDockItemGrip *grip)
......@@ -143,7 +141,7 @@ gdl_dock_item_grip_expose (GtkWidget *widget,
}
return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
return GTK_WIDGET_CLASS (gdl_dock_item_grip_parent_class)->expose_event (widget, event);
}
static void
......@@ -209,7 +207,7 @@ gdl_dock_item_grip_destroy (GtkObject *object)
g_free (priv);
}
GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
GTK_OBJECT_CLASS (gdl_dock_item_grip_parent_class)->destroy (object);
}
static void
......@@ -334,7 +332,7 @@ gdl_dock_item_grip_iconify_clicked (GtkWidget *widget,
}
static void
gdl_dock_item_grip_instance_init (GdlDockItemGrip *grip)
gdl_dock_item_grip_init (GdlDockItemGrip *grip)
{
GtkWidget *image;
......@@ -390,7 +388,7 @@ gdl_dock_item_grip_realize (GtkWidget *widget)
{
GdlDockItemGrip *grip = GDL_DOCK_ITEM_GRIP (widget);
GTK_WIDGET_CLASS (parent_class)->realize (widget);
GTK_WIDGET_CLASS (gdl_dock_item_grip_parent_class)->realize (widget);
g_return_if_fail (grip->_priv != NULL);
......@@ -450,7 +448,7 @@ gdl_dock_item_grip_unrealize (GtkWidget *widget)
grip->title_window = NULL;
}
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
GTK_WIDGET_CLASS (gdl_dock_item_grip_parent_class)->unrealize (widget);
}
static void
......@@ -458,7 +456,7 @@ gdl_dock_item_grip_map (GtkWidget *widget)
{
GdlDockItemGrip *grip = GDL_DOCK_ITEM_GRIP (widget);
GTK_WIDGET_CLASS (parent_class)->map (widget);
GTK_WIDGET_CLASS (gdl_dock_item_grip_parent_class)->map (widget);
if (grip->title_window)
gdk_window_show (grip->title_window);
......@@ -472,7 +470,7 @@ gdl_dock_item_grip_unmap (GtkWidget *widget)
if (grip->title_window)
gdk_window_hide (grip->title_window);
GTK_WIDGET_CLASS (parent_class)->unmap (widget);
GTK_WIDGET_CLASS (gdl_dock_item_grip_parent_class)->unmap (widget);
}
static void
......@@ -532,7 +530,7 @@ gdl_dock_item_grip_size_allocate (GtkWidget *widget,
grip = GDL_DOCK_ITEM_GRIP (widget);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
GTK_WIDGET_CLASS (gdl_dock_item_grip_parent_class)->size_allocate (widget, allocation);
gtk_widget_size_request (grip->_priv->close_button,
&close_requisition);
......@@ -678,7 +676,6 @@ gdl_dock_item_grip_class_init (GdlDockItemGripClass *klass)
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
parent_class = g_type_class_peek_parent (klass);
gobject_class = G_OBJECT_CLASS (klass);
gtk_object_class = GTK_OBJECT_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
......
......@@ -37,7 +37,6 @@
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include "gdl-tools.h"
#include "gdl-dock.h"
#include "gdl-dock-item.h"
#include "gdl-dock-item-grip.h"
......@@ -54,7 +53,6 @@
/* ----- Private prototypes ----- */
static void gdl_dock_item_class_init (GdlDockItemClass *class);
static void gdl_dock_item_instance_init (GdlDockItem *item);
static GObject *gdl_dock_item_constructor (GType type,
guint n_construct_properties,
......@@ -193,7 +191,7 @@ struct _GdlDockItemPrivate {
/* ----- Private functions ----- */
GDL_CLASS_BOILERPLATE (GdlDockItem, gdl_dock_item, GdlDockObject, GDL_TYPE_DOCK_OBJECT);
G_DEFINE_TYPE (GdlDockItem, gdl_dock_item, GDL_TYPE_DOCK_OBJECT);
static void
gdl_dock_item_class_init (GdlDockItemClass *klass)
......@@ -404,7 +402,7 @@ gdl_dock_item_class_init (GdlDockItemClass *klass)
}
static void
gdl_dock_item_instance_init (GdlDockItem *item)
gdl_dock_item_init (GdlDockItem *item)
{
gtk_widget_set_has_window (GTK_WIDGET (item), TRUE);
......@@ -456,12 +454,9 @@ gdl_dock_item_constructor (GType type,
{
GObject *g_object;
g_object = GDL_CALL_PARENT_WITH_DEFAULT (G_OBJECT_CLASS,
constructor,
(type,
n_construct_properties,
construct_param),
NULL);
g_object = G_OBJECT_CLASS (gdl_dock_item_parent_class)-> constructor (type,
n_construct_properties,
construct_param);
if (g_object) {
GdlDockItem *item = GDL_DOCK_ITEM (g_object);
GtkWidget *hbox;
......@@ -633,7 +628,7 @@ gdl_dock_item_destroy (GtkObject *object)
g_free (priv);
}
GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
GTK_OBJECT_CLASS (gdl_dock_item_parent_class)->destroy (object);
}
static void
......@@ -994,9 +989,10 @@ gdl_dock_item_expose (GtkWidget *widget,
g_return_val_if_fail (event != NULL, FALSE);
if (gtk_widget_is_drawable (widget) &&
event->window == gtk_widget_get_window (widget)) {
event->window == gtk_widget_get_window (widget))
{
gdl_dock_item_paint (widget, event);
GDL_CALL_PARENT_GBOOLEAN(GTK_WIDGET_CLASS, expose_event, (widget,event));
GTK_WIDGET_CLASS (gdl_dock_item_parent_class)->expose_event (widget,event);
}
return FALSE;
......@@ -1152,10 +1148,7 @@ gdl_dock_item_key_press (GtkWidget *widget,
if (event_handled)
return TRUE;
else
return GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS,
key_press_event,
(widget, event),
FALSE);
return GTK_WIDGET_CLASS (gdl_dock_item_parent_class)->key_press_event (widget, event);
}
static gboolean
......@@ -1820,8 +1813,8 @@ gdl_dock_item_set_orientation (GdlDockItem *item,
"orientation", orientation,
NULL);
};
GDL_CALL_VIRTUAL (item, GDL_DOCK_ITEM_GET_CLASS, set_orientation, (item, orientation));
if (GDL_DOCK_ITEM_GET_CLASS (item)->set_orientation)
GDL_DOCK_ITEM_GET_CLASS (item)->set_orientation (item, orientation);
g_object_notify (G_OBJECT (item), "orientation");
}
}
......
......@@ -30,7 +30,6 @@
#include <gtk/gtk.h>
#include "gdl-dock-layout.h"
#include "gdl-tools.h"
#include "gdl-dock-placeholder.h"
......@@ -82,8 +81,6 @@ struct _GdlDockLayoutUIData {
static void gdl_dock_layout_class_init (GdlDockLayoutClass *klass);
static void gdl_dock_layout_instance_init (GdlDockLayout *layout);
static void gdl_dock_layout_set_property (GObject *object,
guint prop_id,
const GValue *value,
......@@ -106,7 +103,7 @@ static void gdl_dock_layout_build_models (GdlDockLayout *layout);
/* ----- Private implementation ----- */
GDL_CLASS_BOILERPLATE (GdlDockLayout, gdl_dock_layout, GObject, G_TYPE_OBJECT);
G_DEFINE_TYPE (GdlDockLayout, gdl_dock_layout, G_TYPE_OBJECT);
static void
gdl_dock_layout_class_init (GdlDockLayoutClass *klass)
......@@ -135,7 +132,7 @@ gdl_dock_layout_class_init (GdlDockLayoutClass *klass)
}
static void
gdl_dock_layout_instance_init (GdlDockLayout *layout)
gdl_dock_layout_init (GdlDockLayout *layout)
{
layout->master = NULL;
layout->dirty = FALSE;
......
......@@ -27,7 +27,6 @@
#include "gdl-i18n.h"
#include "gdl-tools.h"
#include "gdl-dock-master.h"
#include "gdl-dock.h"
#include "gdl-dock-item.h"
......@@ -39,7 +38,6 @@
/* ----- Private prototypes ----- */
static void gdl_dock_master_class_init (GdlDockMasterClass *klass);
static void gdl_dock_master_instance_init (GdlDockMaster *master);
static void gdl_dock_master_dispose (GObject *g_object);
static void gdl_dock_master_set_property (GObject *object,
......@@ -122,7 +120,7 @@ static guint master_signals [LAST_SIGNAL] = { 0 };
/* ----- Private interface ----- */
GDL_CLASS_BOILERPLATE (GdlDockMaster, gdl_dock_master, GObject, G_TYPE_OBJECT);
G_DEFINE_TYPE (GdlDockMaster, gdl_dock_master, G_TYPE_OBJECT);
static void
gdl_dock_master_class_init (GdlDockMasterClass *klass)
......@@ -174,7 +172,7 @@ gdl_dock_master_class_init (GdlDockMasterClass *klass)
}
static void
gdl_dock_master_instance_init (GdlDockMaster *master)
gdl_dock_master_init (GdlDockMaster *master)
{
master->dock_objects = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, NULL);
......@@ -306,7 +304,7 @@ gdl_dock_master_dispose (GObject *g_object)
master->_priv = NULL;
}
GDL_CALL_PARENT (G_OBJECT_CLASS, dispose, (g_object));
G_OBJECT_CLASS (gdl_dock_master_parent_class)->dispose (g_object);
}
static void
......
......@@ -26,7 +26,6 @@
#include "gdl-i18n.h"
#include "gdl-switcher.h"
#include "gdl-tools.h"
#include "gdl-dock-notebook.h"
#include "gdl-dock-tablabel.h"
......@@ -34,7 +33,6 @@
/* Private prototypes */
static void gdl_dock_notebook_class_init (GdlDockNotebookClass *klass);
static void gdl_dock_notebook_instance_init (GdlDockNotebook *notebook);
static void gdl_dock_notebook_set_property (GObject *object,
guint prop_id,
const GValue *value,
......@@ -90,7 +88,7 @@ enum {
/* ----- Private functions ----- */
GDL_CLASS_BOILERPLATE (GdlDockNotebook, gdl_dock_notebook, GdlDockItem, GDL_TYPE_DOCK_ITEM) ;
G_DEFINE_TYPE (GdlDockNotebook, gdl_dock_notebook, GDL_TYPE_DOCK_ITEM);
static void
gdl_dock_notebook_class_init (GdlDockNotebookClass *klass)
......@@ -176,7 +174,7 @@ gdl_dock_notebook_button_cb (GtkWidget *widget,
}
static void
gdl_dock_notebook_instance_init (GdlDockNotebook *notebook)
gdl_dock_notebook_init (GdlDockNotebook *notebook)
{
GdlDockItem *item;
......@@ -250,7 +248,7 @@ gdl_dock_notebook_destroy (GtkObject *object)
/* we need to call the virtual first, since in GdlDockDestroy our
children dock objects are detached */
GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
GTK_OBJECT_CLASS (gdl_dock_notebook_parent_class)->destroy (object);
/* after that we can remove the GtkNotebook */
if (item->child) {
......@@ -324,8 +322,8 @@ gdl_dock_notebook_forall (GtkContainer *container,
if (include_internals) {
/* use GdlDockItem's forall */
GDL_CALL_PARENT (GTK_CONTAINER_CLASS, forall,
(container, include_internals, callback, callback_data));
GTK_CONTAINER_CLASS (gdl_dock_notebook_parent_class)->forall
(container, include_internals, callback, callback_data);
}
else {
item = GDL_DOCK_ITEM (container);
......@@ -427,8 +425,7 @@ gdl_dock_notebook_dock (GdlDockObject *object,
}
}
else
GDL_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, dock,
(object, requestor, position, other_data));
GDL_DOCK_OBJECT_CLASS (gdl_dock_notebook_parent_class)->dock (object, requestor, position, other_data);
}
static void
......@@ -442,7 +439,7 @@ gdl_dock_notebook_set_orientation (GdlDockItem *item,
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (item->child), GTK_POS_LEFT);
}
GDL_CALL_PARENT (GDL_DOCK_ITEM_CLASS, set_orientation, (item, orientation));
GDL_DOCK_ITEM_CLASS (gdl_dock_notebook_parent_class)->set_orientation (item, orientation);
}
static gboolean
......@@ -487,7 +484,7 @@ gdl_dock_notebook_present (GdlDockObject *object,
if (i >= 0)
gtk_notebook_set_current_page (GTK_NOTEBOOK (item->child), i);
GDL_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, present, (object, child));
GDL_DOCK_OBJECT_CLASS (gdl_dock_notebook_parent_class)->present (object, child);
}
static gboolean
......
......@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <string.h>
#include "gdl-tools.h"
#include "gdl-dock-object.h"
#include "gdl-dock-master.h"
#include "libgdltypebuiltins.h"
......@@ -46,7 +45,6 @@
/* ----- Private prototypes ----- */
static void gdl_dock_object_class_init (GdlDockObjectClass *klass);
static void gdl_dock_object_instance_init (GdlDockObject *object);
static void gdl_dock_object_set_property (GObject *g_object,
guint prop_id,
......@@ -95,7 +93,7 @@ static guint gdl_dock_object_signals [LAST_SIGNAL] = { 0 };
/* ----- Private interface ----- */
GDL_CLASS_BOILERPLATE (GdlDockObject, gdl_dock_object, GtkContainer, GTK_TYPE_CONTAINER);
G_DEFINE_TYPE (GdlDockObject, gdl_dock_object, GTK_TYPE_CONTAINER);
static void
gdl_dock_object_class_init (GdlDockObjectClass *klass)
......@@ -186,7 +184,7 @@ gdl_dock_object_class_init (GdlDockObjectClass *klass)
}
static void
gdl_dock_object_instance_init (GdlDockObject *object)
gdl_dock_object_init (GdlDockObject *object)
{
object->flags = GDL_DOCK_AUTOMATIC;
object->freeze_count = 0;
......@@ -268,7 +266,7 @@ gdl_dock_object_finalize (GObject *g_object)
g_free (object->stock_id);
object->stock_id = NULL;
GDL_CALL_PARENT (G_OBJECT_CLASS, finalize, (g_object));
G_OBJECT_CLASS (gdl_dock_object_parent_class)->finalize (g_object);
}
static void
......@@ -305,7 +303,7 @@ gdl_dock_object_destroy (GtkObject *gtk_object)
if (object->master)
gdl_dock_object_unbind (object);
GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (gtk_object));
GTK_OBJECT_CLASS(gdl_dock_object_parent_class)->destroy (gtk_object);
}
static void
......@@ -326,7 +324,7 @@ gdl_dock_object_show (GtkWidget *widget)
(GtkCallback) gdl_dock_object_foreach_automatic,
gtk_widget_show);
}
GDL_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
GTK_WIDGET_CLASS (gdl_dock_object_parent_class)->show (widget);
}
static void
......@@ -337,7 +335,7 @@ gdl_dock_object_hide (GtkWidget *widget)
(GtkCallback) gdl_dock_object_foreach_automatic,
gtk_widget_hide);
}
GDL_CALL_PARENT (GTK_WIDGET_CLASS, hide, (widget));
GTK_WIDGET_CLASS (gdl_dock_object_parent_class)->hide (widget);
}
static void
......@@ -541,7 +539,8 @@ gdl_dock_object_reduce (GdlDockObject *object)
return;
}
GDL_CALL_VIRTUAL (object, GDL_DOCK_OBJECT_GET_CLASS, reduce, (object));
if (GDL_DOCK_OBJECT_GET_CLASS (object)->reduce)
GDL_DOCK_OBJECT_GET_CLASS (object)->reduce (object);
}
gboolean
......@@ -551,12 +550,11 @@ gdl_dock_object_dock_request (GdlDockObject *object,
GdlDockRequest *request)
{
g_return_val_if_fail (object != NULL && request != NULL, FALSE);
return GDL_CALL_VIRTUAL_WITH_DEFAULT (object,
GDL_DOCK_OBJECT_GET_CLASS,
dock_request,
(object, x, y, request),
FALSE);
if (GDL_DOCK_OBJECT_GET_CLASS (object)->dock_request)
return GDL_DOCK_OBJECT_GET_CLASS (object)->dock_request (object, x, y, request);
else
return FALSE;
}
/**
......@@ -677,11 +675,10 @@ gdl_dock_object_reorder (GdlDockObject *object,
{
g_return_val_if_fail (object != NULL && child != NULL, FALSE);
return GDL_CALL_VIRTUAL_WITH_DEFAULT (object,
GDL_DOCK_OBJECT_GET_CLASS,
reorder,
(object, child, new_position, other_data),
FALSE);
if (GDL_DOCK_OBJECT_GET_CLASS (object)->reorder)
GDL_DOCK_OBJECT_GET_CLASS (object)->reorder (object, child, new_position, other_data);
else
return FALSE;
}
void
......@@ -697,7 +694,8 @@ gdl_dock_object_present (GdlDockObject *object,
/* chain the call to our parent */
gdl_dock_object_present (parent, object);
GDL_CALL_VIRTUAL (object, GDL_DOCK_OBJECT_GET_CLASS, present, (object, child));
if (GDL_DOCK_OBJECT_GET_CLASS (object)->present)
GDL_DOCK_OBJECT_GET_CLASS (object)->present (object, child);
}
/**
......@@ -730,10 +728,10 @@ gdl_dock_object_child_placement (GdlDockObject *object,
if (!gdl_dock_object_is_compound (object))
return FALSE;
return GDL_CALL_VIRTUAL_WITH_DEFAULT (object, GDL_DOCK_OBJECT_GET_CLASS,
child_placement,
(object, child, placement),
FALSE);
if (GDL_DOCK_OBJECT_GET_CLASS (object)->child_placement)
GDL_DOCK_OBJECT_GET_CLASS (object)->child_placement (object, child, placement);
else
return FALSE;
}
......
......@@ -29,14 +29,13 @@
#include <string.h>
#include <gtk/gtk.h>
#include "gdl-tools.h"
#include "gdl-dock-paned.h"
/* Private prototypes */
static void gdl_dock_paned_class_init (GdlDockPanedClass *klass);
static void gdl_dock_paned_instance_init (GdlDockPaned *paned);
static void gdl_dock_paned_init (GdlDockPaned *paned);
static GObject *gdl_dock_paned_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_param);
......@@ -88,7 +87,7 @@ enum {
/* ----- Private functions ----- */
GDL_CLASS_BOILERPLATE (GdlDockPaned, gdl_dock_paned, GdlDockItem, GDL_TYPE_DOCK_ITEM);
G_DEFINE_TYPE (GdlDockPaned, gdl_dock_paned, GDL_TYPE_DOCK_ITEM);
static void
gdl_dock_paned_class_init (GdlDockPanedClass *klass)
......@@ -136,7 +135,7 @@ gdl_dock_paned_class_init (GdlDockPanedClass *klass)
}
static void
gdl_dock_paned_instance_init (GdlDockPaned *paned)
gdl_dock_paned_init (GdlDockPaned *paned)
{
paned->position_changed = FALSE;
}
......@@ -221,13 +220,10 @@ gdl_dock_paned_constructor (GType type,
GObjectConstructParam *construct_param)
{
GObject *g_object;
g_object = GDL_CALL_PARENT_WITH_DEFAULT (G_OBJECT_CLASS,
constructor,
(type,
n_construct_properties,
construct_param),
NULL);
g_object = G_OBJECT_CLASS (gdl_dock_paned_parent_class)-> constructor (type,
n_construct_properties,
construct_param);
if (g_object) {
GdlDockItem *item = GDL_DOCK_ITEM (g_object);
......@@ -290,7 +286,7 @@ gdl_dock_paned_destroy (GtkObject *object)
/* we need to call the virtual first, since in GdlDockDestroy our
children dock objects are detached */
GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
GTK_OBJECT_CLASS (gdl_dock_paned_parent_class)->destroy (object);
/* after that we can remove the GtkNotebook */
if (item->child) {
......@@ -347,8 +343,8 @@ gdl_dock_paned_forall (GtkContainer *container,
if (include_internals) {
/* use GdlDockItem's forall */
GDL_CALL_PARENT (GTK_CONTAINER_CLASS, forall,
(container, include_internals, callback, callback_data));
GTK_CONTAINER_CLASS (gdl_dock_paned_parent_class)->forall
(container, include_internals, callback, callback_data);
}
else {
item = GDL_DOCK_ITEM (container);
......@@ -587,8 +583,8 @@ gdl_dock_paned_dock (GdlDockObject *object,
if (!done) {
/* this will create another paned and reparent us there */
GDL_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, dock, (object, requestor, position,
other_data));
GDL_DOCK_OBJECT_CLASS (gdl_dock_paned_parent_class)->dock (object, requestor, position,
other_data);
}
else {
gdl_dock_item_show_grip (GDL_DOCK_ITEM (requestor));
......@@ -634,7 +630,7 @@ gdl_dock_paned_set_orientation (GdlDockItem *item,