Here are the patches i needed to make dia compile with gtk+ cvs HEAD. Some
of it can probably be applied now.
/ Alex
Index: configure.in
===================================================================
RCS file: /cvs/gnome/dia/configure.in,v
retrieving revision 1.95
diff -u -p -r1.95 configure.in
--- configure.in 2001/01/08 22:20:14 1.95
+++ configure.in 2001/01/12 08:21:19
@@ -24,7 +24,7 @@ AC_PROG_MAKE_SET
AC_ISC_POSIX
dnl Checks for libraries.
-AM_PATH_GTK(1.2.0)
+AM_PATH_GTK_2_0(1.3.2)
dnl XIM support (on by default)
AC_ARG_ENABLE(xim,
@@ -131,7 +131,7 @@ dnl
dnl gdk_pixbuf
dnl
-AM_PATH_GDK_PIXBUF(0.7.0,,AC_MSG_ERROR([gdk-pixbuf >= 0.7.0 is required]))
+dnl AM_PATH_GDK_PIXBUF(0.7.0,,AC_MSG_ERROR([gdk-pixbuf >= 0.7.0 is required]))
dnl
dnl libpng
Index: app/commands.c
===================================================================
RCS file: /cvs/gnome/dia/app/commands.c,v
retrieving revision 1.69
diff -u -p -r1.69 commands.c
--- app/commands.c 2001/01/05 16:36:40 1.69
+++ app/commands.c 2001/01/12 08:21:19
@@ -469,7 +469,7 @@ help_about_callback(GtkWidget *widget, g
if (!logo) {
gchar* datadir = dia_get_data_directory("");
g_snprintf(str, sizeof(str), "%s%sdia_logo.png", datadir, G_DIR_SEPARATOR_S);
- logo = gdk_pixbuf_new_from_file(str);
+ logo = gdk_pixbuf_new_from_file(str, NULL);
g_free(datadir);
}
Index: app/diapagelayout.c
===================================================================
RCS file: /cvs/gnome/dia/app/diapagelayout.c,v
retrieving revision 1.12
diff -u -p -r1.12 diapagelayout.c
--- app/diapagelayout.c 2000/08/10 07:10:11 1.12
+++ app/diapagelayout.c 2001/01/12 08:21:19
@@ -55,8 +55,9 @@ dia_page_layout_get_type(void)
sizeof(DiaPageLayoutClass),
(GtkClassInitFunc) dia_page_layout_class_init,
(GtkObjectInitFunc) dia_page_layout_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
pl_type = gtk_type_unique(gtk_table_get_type(), &pl_info);
}
@@ -74,11 +75,11 @@ dia_page_layout_class_init(DiaPageLayout
pl_signals[CHANGED] =
gtk_signal_new("changed",
GTK_RUN_FIRST,
- object_class->type,
+ GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET(DiaPageLayoutClass, changed),
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
- gtk_object_class_add_signals(object_class, pl_signals, LAST_SIGNAL);
+ /* gtk_object_class_add_signals(object_class, pl_signals, LAST_SIGNAL); */
object_class->destroy = dia_page_layout_destroy;
}
Index: app/diaunitspinner.c
===================================================================
RCS file: /cvs/gnome/dia/app/diaunitspinner.c,v
retrieving revision 1.6
diff -u -p -r1.6 diaunitspinner.c
--- app/diaunitspinner.c 2001/01/05 16:36:40 1.6
+++ app/diaunitspinner.c 2001/01/12 08:21:19
@@ -66,8 +66,9 @@ dia_unit_spinner_get_type(void)
sizeof(DiaUnitSpinnerClass),
(GtkClassInitFunc) dia_unit_spinner_class_init,
(GtkObjectInitFunc) dia_unit_spinner_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
us_type = gtk_type_unique(gtk_spin_button_get_type(), &us_info);
}
@@ -90,18 +91,18 @@ dia_unit_spinner_value_changed(GtkAdjust
static gint dia_unit_spinner_focus_out(GtkWidget *widget, GdkEventFocus *ev);
static gint dia_unit_spinner_button_press(GtkWidget *widget,GdkEventButton*ev);
static gint dia_unit_spinner_key_press(GtkWidget *widget, GdkEventKey *event);
-static void dia_unit_spinner_activate(GtkEditable *editable);
+static void dia_unit_spinner_activate(GtkEntry *editable);
static void
dia_unit_spinner_class_init(DiaUnitSpinnerClass *class)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkEditableClass *editable_class;
+ GtkEntryClass *editable_class;
object_class = (GtkObjectClass *)class;
widget_class = (GtkWidgetClass *)class;
- editable_class = (GtkEditableClass *)class;
+ editable_class = (GtkEntryClass *)class;
widget_class->focus_out_event = dia_unit_spinner_focus_out;
widget_class->button_press_event = dia_unit_spinner_button_press;
@@ -203,7 +204,7 @@ dia_unit_spinner_update(DiaUnitSpinner *
static gint
dia_unit_spinner_focus_out(GtkWidget *widget, GdkEventFocus *event)
{
- if (GTK_EDITABLE(widget)->editable)
+ if (GTK_ENTRY(widget)->editable)
dia_unit_spinner_update(DIA_UNIT_SPINNER(widget));
return GTK_WIDGET_CLASS(entry_class)->focus_out_event(widget, event);
}
@@ -220,7 +221,7 @@ dia_unit_spinner_key_press(GtkWidget *wi
{
gint key = event->keyval;
- if (GTK_EDITABLE (widget)->editable &&
+ if (GTK_ENTRY (widget)->editable &&
(key == GDK_Up || key == GDK_Down ||
key == GDK_Page_Up || key == GDK_Page_Down))
dia_unit_spinner_update (DIA_UNIT_SPINNER(widget));
@@ -228,7 +229,7 @@ dia_unit_spinner_key_press(GtkWidget *wi
}
static void
-dia_unit_spinner_activate(GtkEditable *editable)
+dia_unit_spinner_activate(GtkEntry *editable)
{
if (editable->editable)
dia_unit_spinner_update(DIA_UNIT_SPINNER(editable));
Index: app/gtkwrapbox.c
===================================================================
RCS file: /cvs/gnome/dia/app/gtkwrapbox.c,v
retrieving revision 1.1
diff -u -p -r1.1 gtkwrapbox.c
--- app/gtkwrapbox.c 2000/02/20 04:28:15 1.1
+++ app/gtkwrapbox.c 2001/01/12 08:21:19
@@ -129,7 +129,7 @@ gtk_wrap_box_class_init (GtkWrapBoxClass
widget_class->map = gtk_wrap_box_map;
widget_class->unmap = gtk_wrap_box_unmap;
- widget_class->draw = gtk_wrap_box_draw;
+ // widget_class->draw = gtk_wrap_box_draw;
widget_class->expose_event = gtk_wrap_box_expose;
container_class->add = gtk_wrap_box_add;
@@ -732,6 +732,7 @@ gtk_wrap_box_unmap (GtkWidget *widget)
gtk_widget_unmap (child->widget);
}
+/*
static void
gtk_wrap_box_draw (GtkWidget *widget,
GdkRectangle *area)
@@ -746,6 +747,7 @@ gtk_wrap_box_draw (GtkWidget *widget,
gtk_widget_intersect (child->widget, area, &child_area))
gtk_widget_draw (child->widget, &child_area);
}
+*/
static gint
gtk_wrap_box_expose (GtkWidget *widget,
Index: app/gtkwrapbox.h
===================================================================
RCS file: /cvs/gnome/dia/app/gtkwrapbox.h,v
retrieving revision 1.1
diff -u -p -r1.1 gtkwrapbox.h
--- app/gtkwrapbox.h 2000/02/20 04:28:15 1.1
+++ app/gtkwrapbox.h 2001/01/12 08:21:19
@@ -38,7 +38,7 @@ extern "C" {
#define GTK_WRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass),
GTK_TYPE_WRAP_BOX, GtkWrapBoxClass))
#define GTK_IS_WRAP_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_WRAP_BOX))
#define GTK_IS_WRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),
GTK_TYPE_WRAP_BOX))
-#define GTK_WRAP_BOX_GET_CLASS(obj) (GTK_WRAP_BOX_CLASS (((GtkObject*)
(obj))->klass))
+#define GTK_WRAP_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_WRAP_BOX,
+GtkWrapBoxClass))
/* --- typedefs --- */
Index: app/interface.c
===================================================================
RCS file: /cvs/gnome/dia/app/interface.c,v
retrieving revision 1.50
diff -u -p -r1.50 interface.c
--- app/interface.c 2001/01/05 16:36:40 1.50
+++ app/interface.c 2001/01/12 08:21:19
@@ -314,14 +314,17 @@ create_display_shell(DDisplay *ddisp,
GTK_SIGNAL_FUNC(origin_button_press), ddisp);
ddisp->hrule = gtk_hruler_new ();
+ /*
gtk_signal_connect_object (GTK_OBJECT (ddisp->shell), "motion_notify_event",
- (GtkSignalFunc) GTK_WIDGET_CLASS (GTK_OBJECT
(ddisp->hrule)->klass)->motion_notify_event,
+ (GtkSignalFunc) GTK_WIDGET_GET_CLASS
+(ddisp)->motion_notify_event,
GTK_OBJECT (ddisp->hrule));
-
+ */
ddisp->vrule = gtk_vruler_new ();
+ /*
gtk_signal_connect_object (GTK_OBJECT (ddisp->shell), "motion_notify_event",
- (GtkSignalFunc) GTK_WIDGET_CLASS (GTK_OBJECT
(ddisp->vrule)->klass)->motion_notify_event,
+ (GtkSignalFunc) GTK_WIDGET_GET_CLASS
+(ddisp->vrule)->motion_notify_event,
GTK_OBJECT (ddisp->vrule));
+ */
ddisp->hsb = gtk_hscrollbar_new (ddisp->hsbdata);
GTK_WIDGET_UNSET_FLAGS (ddisp->hsb, GTK_CAN_FOCUS);
@@ -715,7 +718,7 @@ fill_sheet_wbox(GtkWidget *menu_item, Sh
} else if (sheet_obj->pixmap_file != NULL) {
GdkPixbuf *pixbuf;
- pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file);
+ pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file, NULL);
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 1.0);
gdk_pixbuf_unref(pixbuf);
Index: app/layer_dialog.c
===================================================================
RCS file: /cvs/gnome/dia/app/layer_dialog.c,v
retrieving revision 1.13
diff -u -p -r1.13 layer_dialog.c
--- app/layer_dialog.c 2001/01/05 16:36:40 1.13
+++ app/layer_dialog.c 2001/01/12 08:21:19
@@ -844,8 +844,9 @@ dia_layer_widget_get_type(void)
sizeof (DiaLayerWidgetClass),
(GtkClassInitFunc) dia_layer_widget_class_init,
(GtkObjectInitFunc) dia_layer_widget_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
dlw_type = gtk_type_unique (gtk_list_item_get_type (), &dlw_info);
Index: app/render_gdk.c
===================================================================
RCS file: /cvs/gnome/dia/app/render_gdk.c,v
retrieving revision 1.16
diff -u -p -r1.16 render_gdk.c
--- app/render_gdk.c 2000/03/29 21:46:06 1.16
+++ app/render_gdk.c 2001/01/12 08:21:20
@@ -986,11 +986,8 @@ clip_region_add_rect(RendererGdk *render
old_reg = renderer->clip_region;
- renderer->clip_region =
- gdk_region_union_with_rect( renderer->clip_region, &clip_rect );
+ gdk_region_union_with_rect( renderer->clip_region, &clip_rect );
- gdk_region_destroy(old_reg);
-
gdk_gc_set_clip_region(renderer->render_gc, renderer->clip_region);
}
Index: app/splash.c
===================================================================
RCS file: /cvs/gnome/dia/app/splash.c,v
retrieving revision 1.3
diff -u -p -r1.3 splash.c
--- app/splash.c 2001/01/05 16:36:40 1.3
+++ app/splash.c 2001/01/12 08:21:20
@@ -18,7 +18,7 @@ get_logo_pixmap (void)
if (!logo) {
gchar* datadir = dia_get_data_directory("");
g_snprintf(str, sizeof(str), "%s/dia_logo.png", datadir);
- logo = gdk_pixbuf_new_from_file(str);
+ logo = gdk_pixbuf_new_from_file(str, NULL);
g_free(datadir);
}
Index: lib/dia_image.c
===================================================================
RCS file: /cvs/gnome/dia/lib/dia_image.c,v
retrieving revision 1.12
diff -u -p -r1.12 dia_image.c
--- lib/dia_image.c 2000/10/07 05:29:53 1.12
+++ lib/dia_image.c 2001/01/12 08:21:20
@@ -41,7 +41,7 @@ struct _DiaImage {
void
dia_image_init(void)
{
- gtk_widget_set_default_visual(gdk_rgb_get_visual());
+ // gtk_widget_set_default_visual(gdk_rgb_get_visual());
gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
}
@@ -70,7 +70,7 @@ dia_image_load(gchar *filename)
DiaImage dia_img;
GdkPixbuf *image;
- image = gdk_pixbuf_new_from_file(filename);
+ image = gdk_pixbuf_new_from_file(filename, NULL);
if (image == NULL)
return NULL;
Index: lib/widgets.c
===================================================================
RCS file: /cvs/gnome/dia/lib/widgets.c,v
retrieving revision 1.18
diff -u -p -r1.18 widgets.c
--- lib/widgets.c 2000/01/25 23:54:35 1.18
+++ lib/widgets.c 2001/01/12 08:21:20
@@ -25,6 +25,7 @@
#include <gdk/gdk.h>
#include <gtk/gtkradiomenuitem.h>
#include <gtk/gtklabel.h>
+#include <gtk/gtkcolorseldialog.h>
#include <gtk/gtksignal.h>
/************* DiaFontSelector: ***************/
@@ -60,7 +61,7 @@ dia_font_selector_init (DiaFontSelector
menuitem = gtk_radio_menu_item_new_with_label (group, fontname);
gtk_object_set_user_data(GTK_OBJECT(menuitem), fontname);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
list = g_list_next(list);
@@ -85,8 +86,9 @@ dia_font_selector_get_type (void)
sizeof (DiaFontSelectorClass),
(GtkClassInitFunc) dia_font_selector_class_init,
(GtkObjectInitFunc) dia_font_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
dfs_type = gtk_type_unique (gtk_option_menu_get_type (), &dfs_info);
@@ -176,19 +178,19 @@ dia_alignment_selector_init (DiaAlignmen
menuitem = gtk_radio_menu_item_new_with_label (group, _("Left"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ALIGN_LEFT));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Center"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ALIGN_CENTER));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Right"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ALIGN_RIGHT));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
gtk_menu_set_active(GTK_MENU (menu), DEFAULT_ALIGNMENT);
@@ -207,8 +209,9 @@ dia_alignment_selector_get_type (
sizeof (DiaAlignmentSelectorClass),
(GtkClassInitFunc) dia_alignment_selector_class_init,
(GtkObjectInitFunc) dia_alignment_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
dfs_type = gtk_type_unique (gtk_option_menu_get_type (), &dfs_info);
@@ -296,31 +299,31 @@ dia_line_style_selector_init (DiaLineSty
menuitem = gtk_radio_menu_item_new_with_label (group, _("Solid"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_SOLID));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Dashed"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_DASHED));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Dash-Dot"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_DASH_DOT));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Dash-Dot-Dot"));
gtk_object_set_user_data(GTK_OBJECT(menuitem),
GINT_TO_POINTER(LINESTYLE_DASH_DOT_DOT));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Dotted"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_DOTTED));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
gtk_menu_set_active(GTK_MENU (menu), DEFAULT_LINESTYLE);
@@ -366,8 +369,9 @@ dia_line_style_selector_get_type
sizeof (DiaLineStyleSelectorClass),
(GtkClassInitFunc) dia_line_style_selector_class_init,
(GtkObjectInitFunc) dia_line_style_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
dfs_type = gtk_type_unique (gtk_vbox_get_type (), &dfs_info);
@@ -550,8 +554,9 @@ dia_color_selector_get_type (void
sizeof (DiaColorSelectorClass),
(GtkClassInitFunc) dia_color_selector_class_init,
(GtkObjectInitFunc) dia_color_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
dfs_type = gtk_type_unique (gtk_button_get_type (), &dfs_info);
@@ -654,62 +659,62 @@ dia_arrow_selector_init (DiaArrowSelecto
menuitem = gtk_radio_menu_item_new_with_label (group, _("None"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ARROW_NONE));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Lines"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ARROW_LINES));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Hollow Triangle"));
gtk_object_set_user_data(GTK_OBJECT(menuitem),
GINT_TO_POINTER(ARROW_HOLLOW_TRIANGLE));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Filled Triangle"));
gtk_object_set_user_data(GTK_OBJECT(menuitem),
GINT_TO_POINTER(ARROW_FILLED_TRIANGLE));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Hollow Diamond"));
gtk_object_set_user_data(GTK_OBJECT(menuitem),
GINT_TO_POINTER(ARROW_HOLLOW_DIAMOND));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Filled Diamond"));
gtk_object_set_user_data(GTK_OBJECT(menuitem),
GINT_TO_POINTER(ARROW_FILLED_DIAMOND));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Half Head"));
gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ARROW_HALF_HEAD));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Slashed Cross"));
gtk_object_set_user_data(GTK_OBJECT(menuitem),
GINT_TO_POINTER(ARROW_SLASHED_CROSS));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Filled Ellipse"));
gtk_object_set_user_data(GTK_OBJECT(menuitem),
GINT_TO_POINTER(ARROW_FILLED_ELLIPSE));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_radio_menu_item_new_with_label (group, _("Hollow Ellipse"));
gtk_object_set_user_data(GTK_OBJECT(menuitem),
GINT_TO_POINTER(ARROW_HOLLOW_ELLIPSE));
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
- gtk_menu_append (GTK_MENU (menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
gtk_menu_set_active(GTK_MENU (menu), DEFAULT_ARROW);
@@ -766,8 +771,9 @@ dia_arrow_selector_get_type (void
sizeof (DiaArrowSelectorClass),
(GtkClassInitFunc) dia_arrow_selector_class_init,
(GtkObjectInitFunc) dia_arrow_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
dfs_type = gtk_type_unique (gtk_vbox_get_type (), &dfs_info);
@@ -902,8 +908,9 @@ dia_file_selector_get_type (void)
sizeof (DiaFileSelectorClass),
(GtkClassInitFunc) dia_file_selector_class_init,
(GtkObjectInitFunc) dia_file_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ (GtkClassInitFunc) NULL,
};
dfs_type = gtk_type_unique (gtk_hbox_get_type (), &dfs_info);
Index: lib/widgets.h
===================================================================
RCS file: /cvs/gnome/dia/lib/widgets.h,v
retrieving revision 1.10
diff -u -p -r1.10 widgets.h
--- lib/widgets.h 1999/05/18 20:03:38 1.10
+++ lib/widgets.h 2001/01/12 08:21:20
@@ -20,6 +20,7 @@
#include <gdk/gdk.h>
#include <gtk/gtkmenu.h>
+#include <gtk/gtklabel.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtkcolorsel.h>
