summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-04
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-24
-rw-r--r--ChangeLog.pre-2-44
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--demos/gtk-demo/Makefile.am1
-rw-r--r--demos/gtk-demo/drawingarea.c4
-rw-r--r--demos/gtk-demo/menus.c2
-rw-r--r--demos/gtk-demo/panes.c4
-rw-r--r--demos/gtk-demo/stock_browser.c2
12 files changed, 35 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e9dad8969..3d8d54ab91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-17 Matthias Clasen <matthiasc@waldgeist.poet.de>
+
+ * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
2001-08-17 Anders Carlsson <andersca@gnu.org>
* gtk/gtkstyle.c (create_expander_affine): Divide with floating
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7e9dad8969..3d8d54ab91 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-08-17 Matthias Clasen <matthiasc@waldgeist.poet.de>
+
+ * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
2001-08-17 Anders Carlsson <andersca@gnu.org>
* gtk/gtkstyle.c (create_expander_affine): Divide with floating
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7e9dad8969..3d8d54ab91 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-08-17 Matthias Clasen <matthiasc@waldgeist.poet.de>
+
+ * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
2001-08-17 Anders Carlsson <andersca@gnu.org>
* gtk/gtkstyle.c (create_expander_affine): Divide with floating
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7e9dad8969..3d8d54ab91 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-08-17 Matthias Clasen <matthiasc@waldgeist.poet.de>
+
+ * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
2001-08-17 Anders Carlsson <andersca@gnu.org>
* gtk/gtkstyle.c (create_expander_affine): Divide with floating
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7e9dad8969..3d8d54ab91 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-08-17 Matthias Clasen <matthiasc@waldgeist.poet.de>
+
+ * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
2001-08-17 Anders Carlsson <andersca@gnu.org>
* gtk/gtkstyle.c (create_expander_affine): Divide with floating
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7e9dad8969..3d8d54ab91 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-08-17 Matthias Clasen <matthiasc@waldgeist.poet.de>
+
+ * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
2001-08-17 Anders Carlsson <andersca@gnu.org>
* gtk/gtkstyle.c (create_expander_affine): Divide with floating
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7e9dad8969..3d8d54ab91 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-08-17 Matthias Clasen <matthiasc@waldgeist.poet.de>
+
+ * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
2001-08-17 Anders Carlsson <andersca@gnu.org>
* gtk/gtkstyle.c (create_expander_affine): Divide with floating
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 0cfcbd76fa..64b821d331 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -24,6 +24,7 @@ INCLUDES = @STRIP_BEGIN@ \
-DDEMOCODEDIR="\"$(democodedir)\"" \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
+ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_COMPAT_H \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_COMPAT_H \
diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index 967cc0525e..007c191d2f 100644
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -254,7 +254,7 @@ do_drawingarea (void)
da = gtk_drawing_area_new ();
/* set a minimum size */
- gtk_widget_set_usize (da, 100, 100);
+ gtk_widget_set_size_request (da, 100, 100);
gtk_container_add (GTK_CONTAINER (frame), da);
@@ -278,7 +278,7 @@ do_drawingarea (void)
da = gtk_drawing_area_new ();
/* set a minimum size */
- gtk_widget_set_usize (da, 100, 100);
+ gtk_widget_set_size_request (da, 100, 100);
gtk_container_add (GTK_CONTAINER (frame), da);
diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c
index 8411eabbe1..16688f09d5 100644
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -60,7 +60,7 @@ create_menu (gint depth,
{
sprintf (buf, "item %2d - %d", depth, j);
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 3e10329762..86d11c03da 100644
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -156,12 +156,12 @@ do_panes (void)
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
- gtk_widget_set_usize (frame, 80, 60);
+ gtk_widget_set_size_request (frame, 80, 60);
gtk_paned_add2 (GTK_PANED (hpaned), frame);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
- gtk_widget_set_usize (frame, 60, 80);
+ gtk_widget_set_size_request (frame, 60, 80);
gtk_paned_add2 (GTK_PANED (vpaned), frame);
/* Now create toggle buttons to control sizing */
diff --git a/demos/gtk-demo/stock_browser.c b/demos/gtk-demo/stock_browser.c
index b5966b088c..ac884964a7 100644
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -122,7 +122,7 @@ id_to_macro (const gchar *id)
++p;
}
- g_strup (macro->str);
+ g_ascii_strup (macro->str);
return g_string_free (macro, FALSE);
}
View Lorry Controller Status