Deprecation cleanup

Sun Oct 13 13:43:16 2002  Manish Singh  <yosh@gimp.org>

        * gtk/gtkcurve.[ch] gtk/gtkgamma.[ch] gtk/gtklayout.[ch]
        gtk/gtkwidget.[ch] modules/input/gtkimcontextxim.c
        modules/input/imam-et.c modules/input/imcyrillic-translit.c
        modules/input/imhangul.c modules/input/iminuktitut.c
        modules/input/imipa.c modules/input/imthai-broken.c
        modules/input/imti-er.c modules/input/imti-et.c
        modules/input/imviqr.c: Deprecation cleanup

        * modules/input/Makefile.am: Added disable deprecation flags

11 files changed, 18 insertions, 17 deletions

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 5d8aac795b..eea82b2a56 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -9,6 +9,10 @@ INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)/gdk				\
 	-I$(top_builddir)/gdk				\
 	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+	-DG_DISABLE_DEPRECATED	 			\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED 			\
 	@GTK_DEBUG_FLAGS@				\
 	@GTK_XIM_FLAGS@					\
 	@GTK_DEP_CFLAGS@				\
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index fb371693d7..9bc985a8fd 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -105,7 +105,7 @@ gtk_im_context_xim_register_type (GTypeModule *type_module)
     NULL,           /* class_data */
     sizeof (GtkIMContextXIM),
     0,
-    (GtkObjectInitFunc) gtk_im_context_xim_init,
+    (GInstanceInitFunc) gtk_im_context_xim_init,
   };
 
   gtk_type_im_context_xim = 
@@ -1223,7 +1223,7 @@ status_window_get (GtkIMContextXIM *context_xim,
 
   window = status_window->window;
 
-  gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
+  gtk_window_set_resizable (GTK_WINDOW (status_window), FALSE);
   gtk_widget_set_app_paintable (window, TRUE);
 
   status_label = gtk_label_new ("");
diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c
index 15c9280ff1..bbdb8f7a6e 100644
--- a/modules/input/imam-et.c
+++ b/modules/input/imam-et.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include <stdio.h>
 #include <string.h>
 
 #include <gdk/gdkkeysyms.h>
@@ -33,8 +34,6 @@
 #include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
 
-#include<stdio.h>
-
 GType type_am_et_translit = 0;
 
 static void am_et_class_init (GtkIMContextSimpleClass *class);
@@ -53,7 +52,7 @@ am_et_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) am_et_init,
+    (GInstanceInitFunc) am_et_init,
   };
 
   type_am_et_translit = 
diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index 879a4ada85..5f0a0218b3 100644
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -46,7 +46,7 @@ cyrillic_translit_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) cyrillic_translit_init,
+    (GInstanceInitFunc) cyrillic_translit_init,
   };
 
   type_cyrillic_translit = 
diff --git a/modules/input/imhangul.c b/modules/input/imhangul.c
index e0b5b4f541..24a67a6b21 100644
--- a/modules/input/imhangul.c
+++ b/modules/input/imhangul.c
@@ -49,7 +49,7 @@ hangul_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) hangul_init,
+    (GInstanceInitFunc) hangul_init,
   };
 
   type_hangul = 
diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c
index 128dad78ce..9d1d7827f7 100644
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -49,7 +49,7 @@ inuktitut_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) inuktitut_init,
+    (GInstanceInitFunc) inuktitut_init,
   };
 
   type_inuktitut_translit = 
diff --git a/modules/input/imipa.c b/modules/input/imipa.c
index 6838226cd0..0a1e234702 100644
--- a/modules/input/imipa.c
+++ b/modules/input/imipa.c
@@ -46,7 +46,7 @@ ipa_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) ipa_init,
+    (GInstanceInitFunc) ipa_init,
   };
 
   type_ipa = 
diff --git a/modules/input/imthai-broken.c b/modules/input/imthai-broken.c
index 0ba59d61c9..b31ae4c1d2 100644
--- a/modules/input/imthai-broken.c
+++ b/modules/input/imthai-broken.c
@@ -49,7 +49,7 @@ thai_broken_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) thai_broken_init,
+    (GInstanceInitFunc) thai_broken_init,
   };
 
   type_thai_broken = 
diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c
index c8220a682f..c0c65e6411 100644
--- a/modules/input/imti-er.c
+++ b/modules/input/imti-er.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include <stdio.h>
 #include <string.h>
 
 #include <gdk/gdkkeysyms.h>
@@ -33,8 +34,6 @@
 #include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
 
-#include<stdio.h>
-
 GType type_ti_er_translit = 0;
 
 static void ti_er_class_init (GtkIMContextSimpleClass *class);
@@ -53,7 +52,7 @@ ti_er_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) ti_er_init,
+    (GInstanceInitFunc) ti_er_init,
   };
 
   type_ti_er_translit = 
diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c
index 6d8acb4b8c..3ceab1b97c 100644
--- a/modules/input/imti-et.c
+++ b/modules/input/imti-et.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include <stdio.h>
 #include <string.h>
 
 #include <gdk/gdkkeysyms.h>
@@ -33,8 +34,6 @@
 #include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
 
-#include<stdio.h>
-
 GType type_ti_et_translit = 0;
 
 static void ti_et_class_init (GtkIMContextSimpleClass *class);
@@ -53,7 +52,7 @@ ti_et_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) ti_et_init,
+    (GInstanceInitFunc) ti_et_init,
   };
 
   type_ti_et_translit = 
diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c
index 2a4ad43081..be08db0812 100644
--- a/modules/input/imviqr.c
+++ b/modules/input/imviqr.c
@@ -49,7 +49,7 @@ viqr_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) viqr_init,
+    (GInstanceInitFunc) viqr_init,
   };
 
   type_viqr_translit =