callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecation cleanup

Browse Source 
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
This commit is contained in:
Manish Singh 2002-10-13 20:44:18 +00:00 committed by Manish Singh
parent c77265d3a7
commit aa54cfeede
25 changed files with 758 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
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
Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org> Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch] * gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch]

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
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
Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org> Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch] * gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch]

12
ChangeLog.pre-2-2
View File

@ -1,3 +1,15 @@
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
Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org> Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch] * gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch]

12
ChangeLog.pre-2-4
View File

@ -1,3 +1,15 @@
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
Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org> Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch] * gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch]

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
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
Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org> Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch] * gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch]

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
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
Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org> Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch] * gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch]

69
gtk/gtkcurve.c
View File

@ -33,7 +33,6 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkradiobutton.h" #include "gtkradiobutton.h"
#include "gtksignal.h"
#include "gtktable.h" #include "gtktable.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -78,26 +77,28 @@ static gint gtk_curve_graph_events (GtkWidget *widget,
GtkCurve *c); GtkCurve *c);
static void gtk_curve_size_graph (GtkCurve *curve); static void gtk_curve_size_graph (GtkCurve *curve);
GtkType GType
gtk_curve_get_type (void) gtk_curve_get_type (void)
{ {
static GtkType curve_type = 0; static GType curve_type = 0;
if (!curve_type) if (!curve_type)
{ {
static const GtkTypeInfo curve_info = static const GTypeInfo curve_info =
{ {
"GtkCurve",
sizeof (GtkCurve),
sizeof (GtkCurveClass), sizeof (GtkCurveClass),
(GtkClassInitFunc) gtk_curve_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_curve_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_curve_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, NULL, /* class_data */
sizeof (GtkCurve),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_curve_init,
}; };
curve_type = gtk_type_unique (GTK_TYPE_DRAWING_AREA, &curve_info); curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, "GtkCurve",
&curve_info, 0);
} }
return curve_type; return curve_type;
} }
@ -106,9 +107,8 @@ static void
gtk_curve_class_init (GtkCurveClass *class) gtk_curve_class_init (GtkCurveClass *class)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (class); GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
parent_class = gtk_type_class (GTK_TYPE_DRAWING_AREA); parent_class = g_type_class_peek_parent (class);
gobject_class->finalize = gtk_curve_finalize; gobject_class->finalize = gtk_curve_finalize;
@ -166,9 +166,13 @@ gtk_curve_class_init (GtkCurveClass *class)
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
curve_type_changed_signal = curve_type_changed_signal =
gtk_signal_new ("curve_type_changed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), g_signal_new ("curve_type_changed",
GTK_SIGNAL_OFFSET (GtkCurveClass, curve_type_changed), G_OBJECT_CLASS_TYPE (gobject_class),
_gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkCurveClass, curve_type_changed),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
} }
static void static void
@ -195,8 +199,8 @@ gtk_curve_init (GtkCurve *curve)
old_mask = gtk_widget_get_events (GTK_WIDGET (curve)); old_mask = gtk_widget_get_events (GTK_WIDGET (curve));
gtk_widget_set_events (GTK_WIDGET (curve), old_mask | GRAPH_MASK); gtk_widget_set_events (GTK_WIDGET (curve), old_mask | GRAPH_MASK);
gtk_signal_connect (GTK_OBJECT (curve), "event", g_signal_connect (curve, "event",
(GtkSignalFunc) gtk_curve_graph_events, curve); G_CALLBACK (gtk_curve_graph_events), curve);
gtk_curve_size_graph (curve); gtk_curve_size_graph (curve);
} }
@ -416,8 +420,8 @@ gtk_curve_draw (GtkCurve *c, gint width, gint height)
gdk_draw_arc (c->pixmap, style->fg_gc[state], TRUE, x, y, gdk_draw_arc (c->pixmap, style->fg_gc[state], TRUE, x, y,
RADIUS * 2, RADIUS*2, 0, 360*64); RADIUS * 2, RADIUS*2, 0, 360*64);
} }
gdk_draw_pixmap (GTK_WIDGET (c)->window, style->fg_gc[state], c->pixmap, gdk_draw_drawable (GTK_WIDGET (c)->window, style->fg_gc[state], c->pixmap,
0, 0, 0, 0, width + RADIUS * 2, height + RADIUS * 2); 0, 0, 0, 0, width + RADIUS * 2, height + RADIUS * 2);
} }
static gint static gint
@ -465,8 +469,8 @@ gtk_curve_graph_events (GtkWidget *widget, GdkEvent *event, GtkCurve *c)
{ {
case GDK_CONFIGURE: case GDK_CONFIGURE:
if (c->pixmap) if (c->pixmap)
gdk_pixmap_unref (c->pixmap); g_object_unref (c->pixmap);
c->pixmap = 0; c->pixmap = NULL;
/* fall through */ /* fall through */
case GDK_EXPOSE: case GDK_EXPOSE:
if (!c->pixmap) if (!c->pixmap)
@ -655,7 +659,7 @@ gtk_curve_graph_events (GtkWidget *widget, GdkEvent *event, GtkCurve *c)
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (w), cursor = gdk_cursor_new_for_display (gtk_widget_get_display (w),
c->cursor_type); c->cursor_type);
gdk_window_set_cursor (w->window, cursor); gdk_window_set_cursor (w->window, cursor);
gdk_cursor_destroy (cursor); gdk_cursor_unref (cursor);
} }
retval = TRUE; retval = TRUE;
break; break;
@ -712,7 +716,7 @@ gtk_curve_set_curve_type (GtkCurve *c, GtkCurveType new_type)
c->curve_type = new_type; c->curve_type = new_type;
gtk_curve_interpolate (c, width, height); gtk_curve_interpolate (c, width, height);
} }
gtk_signal_emit (GTK_OBJECT (c), curve_type_changed_signal); g_signal_emit (c, curve_type_changed_signal, 0);
g_object_notify (G_OBJECT (c), "curve_type"); g_object_notify (G_OBJECT (c), "curve_type");
gtk_curve_draw (c, width, height); gtk_curve_draw (c, width, height);
} }
@ -738,8 +742,9 @@ gtk_curve_size_graph (GtkCurve *curve)
else else
height = width / aspect; height = width / aspect;
gtk_drawing_area_size (GTK_DRAWING_AREA (curve), gtk_widget_set_size_request (GTK_WIDGET (curve),
width + RADIUS * 2, height + RADIUS * 2); width + RADIUS * 2,
height + RADIUS * 2);
} }
static void static void
@ -785,7 +790,7 @@ gtk_curve_reset (GtkCurve *c)
if (old_type != GTK_CURVE_TYPE_SPLINE) if (old_type != GTK_CURVE_TYPE_SPLINE)
{ {
gtk_signal_emit (GTK_OBJECT (c), curve_type_changed_signal); g_signal_emit (c, curve_type_changed_signal, 0);
g_object_notify (G_OBJECT (c), "curve_type"); g_object_notify (G_OBJECT (c), "curve_type");
} }
} }
@ -818,7 +823,7 @@ gtk_curve_set_gamma (GtkCurve *c, gfloat gamma)
} }
if (old_type != GTK_CURVE_TYPE_FREE) if (old_type != GTK_CURVE_TYPE_FREE)
gtk_signal_emit (GTK_OBJECT (c), curve_type_changed_signal); g_signal_emit (c, curve_type_changed_signal, 0);
gtk_curve_draw (c, c->num_points, c->height); gtk_curve_draw (c, c->num_points, c->height);
} }
@ -890,7 +895,7 @@ gtk_curve_set_vector (GtkCurve *c, int veclen, gfloat vector[])
} }
if (old_type != GTK_CURVE_TYPE_FREE) if (old_type != GTK_CURVE_TYPE_FREE)
{ {
gtk_signal_emit (GTK_OBJECT (c), curve_type_changed_signal); g_signal_emit (c, curve_type_changed_signal, 0);
g_object_notify (G_OBJECT (c), "curve_type"); g_object_notify (G_OBJECT (c), "curve_type");
} }
@ -1017,7 +1022,7 @@ gtk_curve_get_vector (GtkCurve *c, int veclen, gfloat vector[])
GtkWidget* GtkWidget*
gtk_curve_new (void) gtk_curve_new (void)
{ {
return gtk_type_new (gtk_curve_get_type ()); return g_object_new (GTK_TYPE_CURVE, NULL);
} }
static void static void
@ -1029,7 +1034,7 @@ gtk_curve_finalize (GObject *object)
curve = GTK_CURVE (object); curve = GTK_CURVE (object);
if (curve->pixmap) if (curve->pixmap)
gdk_pixmap_unref (curve->pixmap); g_object_unref (curve->pixmap);
if (curve->point) if (curve->point)
g_free (curve->point); g_free (curve->point);
if (curve->ctlpoint) if (curve->ctlpoint)

12
gtk/gtkcurve.h
View File

@ -47,11 +47,11 @@ extern "C" {
#define GTK_TYPE_CURVE (gtk_curve_get_type ()) #define GTK_TYPE_CURVE (gtk_curve_get_type ())
#define GTK_CURVE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CURVE, GtkCurve)) #define GTK_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CURVE, GtkCurve))
#define GTK_CURVE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CURVE, GtkCurveClass)) #define GTK_CURVE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CURVE, GtkCurveClass))
#define GTK_IS_CURVE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CURVE)) #define GTK_IS_CURVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CURVE))
#define GTK_IS_CURVE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CURVE)) #define GTK_IS_CURVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CURVE))
#define GTK_CURVE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CURVE, GtkCurveClass)) #define GTK_CURVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CURVE, GtkCurveClass))
typedef struct _GtkCurve GtkCurve; typedef struct _GtkCurve GtkCurve;
@ -96,7 +96,7 @@ struct _GtkCurveClass
}; };
GtkType gtk_curve_get_type (void) G_GNUC_CONST; GType gtk_curve_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_curve_new (void); GtkWidget* gtk_curve_new (void);
void gtk_curve_reset (GtkCurve *curve); void gtk_curve_reset (GtkCurve *curve);
void gtk_curve_set_gamma (GtkCurve *curve, gfloat gamma); void gtk_curve_set_gamma (GtkCurve *curve, gfloat gamma);

79
gtk/gtkgamma.c
View File

@ -34,11 +34,10 @@
#include "gtkdrawingarea.h" #include "gtkdrawingarea.h"
#include "gtkentry.h" #include "gtkentry.h"
#include "gtkhbox.h" #include "gtkhbox.h"
#include "gtkimage.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkpixmap.h"
#include "gtkradiobutton.h" #include "gtkradiobutton.h"
#include "gtksignal.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtktable.h" #include "gtktable.h"
#include "gtkvbox.h" #include "gtkvbox.h"
@ -212,26 +211,28 @@ static const char *xpm[][27] =
} }
}; };
GtkType GType
gtk_gamma_curve_get_type (void) gtk_gamma_curve_get_type (void)
{ {
static GtkType gamma_curve_type = 0; static GType gamma_curve_type = 0;
if (!gamma_curve_type) if (!gamma_curve_type)
{ {
static const GtkTypeInfo gamma_curve_info = static const GTypeInfo gamma_curve_info =
{ {
"GtkGammaCurve",
sizeof (GtkGammaCurve),
sizeof (GtkGammaCurveClass), sizeof (GtkGammaCurveClass),
(GtkClassInitFunc) gtk_gamma_curve_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_gamma_curve_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_gamma_curve_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, NULL, /* class_data */
sizeof (GtkGammaCurve),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_gamma_curve_init,
}; };
gamma_curve_type = gtk_type_unique (GTK_TYPE_VBOX, &gamma_curve_info); gamma_curve_type = g_type_register_static (GTK_TYPE_VBOX, "GtkGammaCurve",
&gamma_curve_info, 0);
} }
return gamma_curve_type; return gamma_curve_type;
} }
@ -241,7 +242,7 @@ gtk_gamma_curve_class_init (GtkGammaCurveClass *class)
{ {
GtkObjectClass *object_class; GtkObjectClass *object_class;
parent_class = gtk_type_class (GTK_TYPE_VBOX); parent_class = g_type_class_peek_parent (class);
object_class = (GtkObjectClass *) class; object_class = (GtkObjectClass *) class;
object_class->destroy = gtk_gamma_curve_destroy; object_class->destroy = gtk_gamma_curve_destroy;
@ -260,8 +261,8 @@ gtk_gamma_curve_init (GtkGammaCurve *curve)
gtk_container_add (GTK_CONTAINER (curve), curve->table); gtk_container_add (GTK_CONTAINER (curve), curve->table);
curve->curve = gtk_curve_new (); curve->curve = gtk_curve_new ();
gtk_signal_connect (GTK_OBJECT (curve->curve), "curve_type_changed", g_signal_connect (curve->curve, "curve_type_changed",
(GtkSignalFunc) curve_type_changed_callback, curve); G_CALLBACK (curve_type_changed_callback), curve);
gtk_table_attach_defaults (GTK_TABLE (curve->table), curve->curve, 0, 1, 0, 1); gtk_table_attach_defaults (GTK_TABLE (curve->table), curve->curve, 0, 1, 0, 1);
vbox = gtk_vbox_new (/* homogeneous */ FALSE, /* spacing */ 3); vbox = gtk_vbox_new (/* homogeneous */ FALSE, /* spacing */ 3);
@ -271,13 +272,13 @@ gtk_gamma_curve_init (GtkGammaCurve *curve)
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
{ {
curve->button[i] = gtk_toggle_button_new (); curve->button[i] = gtk_toggle_button_new ();
gtk_object_set_data (GTK_OBJECT (curve->button[i]), "_GtkGammaCurveIndex", g_object_set_data (G_OBJECT (curve->button[i]), "_GtkGammaCurveIndex",
GINT_TO_POINTER (i)); GINT_TO_POINTER (i));
gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]); gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]);
gtk_signal_connect (GTK_OBJECT (curve->button[i]), "realize", g_signal_connect (curve->button[i], "realize",
(GtkSignalFunc) button_realize_callback, 0); G_CALLBACK (button_realize_callback), NULL);
gtk_signal_connect (GTK_OBJECT (curve->button[i]), "toggled", g_signal_connect (curve->button[i], "toggled",
(GtkSignalFunc) button_toggled_callback, curve); G_CALLBACK (button_toggled_callback), curve);
gtk_widget_show (curve->button[i]); gtk_widget_show (curve->button[i]);
} }
@ -285,13 +286,13 @@ gtk_gamma_curve_init (GtkGammaCurve *curve)
for (i = 3; i < 5; ++i) for (i = 3; i < 5; ++i)
{ {
curve->button[i] = gtk_button_new (); curve->button[i] = gtk_button_new ();
gtk_object_set_data (GTK_OBJECT (curve->button[i]), "_GtkGammaCurveIndex", g_object_set_data (G_OBJECT (curve->button[i]), "_GtkGammaCurveIndex",
GINT_TO_POINTER (i)); GINT_TO_POINTER (i));
gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]); gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]);
gtk_signal_connect (GTK_OBJECT (curve->button[i]), "realize", g_signal_connect (curve->button[i], "realize",
(GtkSignalFunc) button_realize_callback, 0); G_CALLBACK (button_realize_callback), NULL);
gtk_signal_connect (GTK_OBJECT (curve->button[i]), "clicked", g_signal_connect (curve->button[i], "clicked",
(GtkSignalFunc) button_clicked_callback, curve); G_CALLBACK (button_clicked_callback), curve);
gtk_widget_show (curve->button[i]); gtk_widget_show (curve->button[i]);
} }
@ -308,16 +309,16 @@ button_realize_callback (GtkWidget *w)
GdkPixmap *pm; GdkPixmap *pm;
int i; int i;
i = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex")); i = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "_GtkGammaCurveIndex"));
pm = gdk_pixmap_create_from_xpm_d (w->window, &mask, pm = gdk_pixmap_create_from_xpm_d (w->window, &mask,
&w->style->bg[GTK_STATE_NORMAL], (gchar **)xpm[i]); &w->style->bg[GTK_STATE_NORMAL], (gchar **)xpm[i]);
pixmap = gtk_pixmap_new (pm, mask); pixmap = gtk_image_new_from_pixmap (pm, mask);
gtk_container_add (GTK_CONTAINER (w), pixmap); gtk_container_add (GTK_CONTAINER (w), pixmap);
gtk_widget_show (pixmap); gtk_widget_show (pixmap);
gdk_pixmap_unref (pm); g_object_unref (pm);
gdk_bitmap_unref (mask); /* a bitmap is really just a special pixmap */ g_object_unref (mask);
} }
static void static void
@ -330,7 +331,7 @@ button_toggled_callback (GtkWidget *w, gpointer data)
if (!GTK_TOGGLE_BUTTON (w)->active) if (!GTK_TOGGLE_BUTTON (w)->active)
return; return;
active = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex")); active = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "_GtkGammaCurveIndex"));
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
if ((i != active) && GTK_TOGGLE_BUTTON (c->button[i])->active) if ((i != active) && GTK_TOGGLE_BUTTON (c->button[i])->active)
@ -381,7 +382,7 @@ button_clicked_callback (GtkWidget *w, gpointer data)
GtkGammaCurve *c = data; GtkGammaCurve *c = data;
int active; int active;
active = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex")); active = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "_GtkGammaCurveIndex"));
if (active == 3) if (active == 3)
{ {
/* set gamma */ /* set gamma */
@ -420,15 +421,15 @@ button_clicked_callback (GtkWidget *w, gpointer data)
hbox = GTK_DIALOG (c->gamma_dialog)->action_area; hbox = GTK_DIALOG (c->gamma_dialog)->action_area;
button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
gtk_signal_connect (GTK_OBJECT (button), "clicked", g_signal_connect (button, "clicked",
(GtkSignalFunc) gamma_cancel_callback, c); G_CALLBACK (gamma_cancel_callback), c);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
gtk_widget_show (button); gtk_widget_show (button);
button = gtk_button_new_from_stock (GTK_STOCK_OK); button = gtk_button_new_from_stock (GTK_STOCK_OK);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked", g_signal_connect (button, "clicked",
(GtkSignalFunc) gamma_ok_callback, c); G_CALLBACK (gamma_ok_callback), c);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button); gtk_widget_grab_default (button);
gtk_widget_show (button); gtk_widget_show (button);
@ -464,7 +465,7 @@ curve_type_changed_callback (GtkWidget *w, gpointer data)
GtkWidget* GtkWidget*
gtk_gamma_curve_new (void) gtk_gamma_curve_new (void)
{ {
return gtk_type_new (GTK_TYPE_GAMMA_CURVE); return g_object_new (GTK_TYPE_GAMMA_CURVE, NULL);
} }
static void static void

12
gtk/gtkgamma.h
View File

@ -48,11 +48,11 @@ extern "C" {
#define GTK_TYPE_GAMMA_CURVE (gtk_gamma_curve_get_type ()) #define GTK_TYPE_GAMMA_CURVE (gtk_gamma_curve_get_type ())
#define GTK_GAMMA_CURVE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve)) #define GTK_GAMMA_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve))
#define GTK_GAMMA_CURVE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass)) #define GTK_GAMMA_CURVE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass))
#define GTK_IS_GAMMA_CURVE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_GAMMA_CURVE)) #define GTK_IS_GAMMA_CURVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_GAMMA_CURVE))
#define GTK_IS_GAMMA_CURVE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_GAMMA_CURVE)) #define GTK_IS_GAMMA_CURVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_GAMMA_CURVE))
#define GTK_GAMMA_CURVE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass)) #define GTK_GAMMA_CURVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass))
typedef struct _GtkGammaCurve GtkGammaCurve; typedef struct _GtkGammaCurve GtkGammaCurve;
typedef struct _GtkGammaCurveClass GtkGammaCurveClass; typedef struct _GtkGammaCurveClass GtkGammaCurveClass;
@ -83,7 +83,7 @@ struct _GtkGammaCurveClass
}; };
GtkType gtk_gamma_curve_get_type (void) G_GNUC_CONST; GType gtk_gamma_curve_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_gamma_curve_new (void); GtkWidget* gtk_gamma_curve_new (void);

83
gtk/gtklayout.c
View File

@ -31,7 +31,6 @@
#include "gdkconfig.h" #include "gdkconfig.h"
#include "gtklayout.h" #include "gtklayout.h"
#include "gtksignal.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
@ -208,39 +207,43 @@ gtk_layout_set_adjustments (GtkLayout *layout,
if (layout->hadjustment && (layout->hadjustment != hadj)) if (layout->hadjustment && (layout->hadjustment != hadj))
{ {
gtk_signal_disconnect_by_data (GTK_OBJECT (layout->hadjustment), layout); g_signal_handlers_disconnect_by_func (layout->hadjustment,
gtk_object_unref (GTK_OBJECT (layout->hadjustment)); gtk_layout_adjustment_changed,
layout);
g_object_unref (layout->hadjustment);
} }
if (layout->vadjustment && (layout->vadjustment != vadj)) if (layout->vadjustment && (layout->vadjustment != vadj))
{ {
gtk_signal_disconnect_by_data (GTK_OBJECT (layout->vadjustment), layout); g_signal_handlers_disconnect_by_func (layout->vadjustment,
gtk_object_unref (GTK_OBJECT (layout->vadjustment)); gtk_layout_adjustment_changed,
layout);
g_object_unref (layout->vadjustment);
} }
if (layout->hadjustment != hadj) if (layout->hadjustment != hadj)
{ {
layout->hadjustment = hadj; layout->hadjustment = hadj;
gtk_object_ref (GTK_OBJECT (layout->hadjustment)); g_object_ref (layout->hadjustment);
gtk_object_sink (GTK_OBJECT (layout->hadjustment)); gtk_object_sink (GTK_OBJECT (layout->hadjustment));
gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width, FALSE); gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width, FALSE);
gtk_signal_connect (GTK_OBJECT (layout->hadjustment), "value_changed", g_signal_connect (layout->hadjustment, "value_changed",
(GtkSignalFunc) gtk_layout_adjustment_changed, G_CALLBACK (gtk_layout_adjustment_changed),
layout); layout);
need_adjust = TRUE; need_adjust = TRUE;
} }
if (layout->vadjustment != vadj) if (layout->vadjustment != vadj)
{ {
layout->vadjustment = vadj; layout->vadjustment = vadj;
gtk_object_ref (GTK_OBJECT (layout->vadjustment)); g_object_ref (layout->vadjustment);
gtk_object_sink (GTK_OBJECT (layout->vadjustment)); gtk_object_sink (GTK_OBJECT (layout->vadjustment));
gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height, FALSE); gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height, FALSE);
gtk_signal_connect (GTK_OBJECT (layout->vadjustment), "value_changed", g_signal_connect (layout->vadjustment, "value_changed",
(GtkSignalFunc) gtk_layout_adjustment_changed, G_CALLBACK (gtk_layout_adjustment_changed),
layout); layout);
need_adjust = TRUE; need_adjust = TRUE;
} }
@ -255,8 +258,8 @@ gtk_layout_finalize (GObject *object)
{ {
GtkLayout *layout = GTK_LAYOUT (object); GtkLayout *layout = GTK_LAYOUT (object);
gtk_object_unref (GTK_OBJECT (layout->hadjustment)); g_object_unref (layout->hadjustment);
gtk_object_unref (GTK_OBJECT (layout->vadjustment)); g_object_unref (layout->vadjustment);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -442,9 +445,9 @@ gtk_layout_set_adjustment_upper (GtkAdjustment *adj,
} }
if (changed || always_emit_changed) if (changed || always_emit_changed)
gtk_signal_emit_by_name (GTK_OBJECT (adj), "changed"); gtk_adjustment_changed (adj);
if (value_changed) if (value_changed)
gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed"); gtk_adjustment_value_changed (adj);
} }
/** /**
@ -542,33 +545,40 @@ gtk_layout_thaw (GtkLayout *layout)
g_return_if_fail (GTK_IS_LAYOUT (layout)); g_return_if_fail (GTK_IS_LAYOUT (layout));
if (layout->freeze_count) if (layout->freeze_count)
if (!(--layout->freeze_count)) {
gtk_widget_draw (GTK_WIDGET (layout), NULL); if (!(--layout->freeze_count))
{
gtk_widget_queue_draw (GTK_WIDGET (layout));
gdk_window_process_updates (GTK_WIDGET (layout)->window, TRUE);
}
}
} }
/* Basic Object handling procedures /* Basic Object handling procedures
*/ */
GtkType GType
gtk_layout_get_type (void) gtk_layout_get_type (void)
{ {
static GtkType layout_type = 0; static GType layout_type = 0;
if (!layout_type) if (!layout_type)
{ {
static const GTypeInfo layout_info = static const GTypeInfo layout_info =
{ {
sizeof (GtkLayoutClass), sizeof (GtkLayoutClass),
NULL, /* base_init */ NULL, /* base_init */
NULL, /* base_finalize */ NULL, /* base_finalize */
(GClassInitFunc) gtk_layout_class_init, (GClassInitFunc) gtk_layout_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkLayout), sizeof (GtkLayout),
16, /* n_preallocs */ 0, /* n_preallocs */
(GInstanceInitFunc) gtk_layout_init, (GInstanceInitFunc) gtk_layout_init,
}; };
layout_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkLayout", &layout_info, 0); layout_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkLayout",
&layout_info, 0);
} }
return layout_type; return layout_type;
@ -578,16 +588,14 @@ static void
gtk_layout_class_init (GtkLayoutClass *class) gtk_layout_class_init (GtkLayoutClass *class)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
GtkObjectClass *object_class;
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class;
GtkContainerClass *container_class; GtkContainerClass *container_class;
gobject_class = (GObjectClass*) class; gobject_class = (GObjectClass*) class;
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class; widget_class = (GtkWidgetClass*) class;
container_class = (GtkContainerClass*) class; container_class = (GtkContainerClass*) class;
parent_class = gtk_type_class (GTK_TYPE_CONTAINER); parent_class = g_type_class_peek_parent (class);
gobject_class->set_property = gtk_layout_set_property; gobject_class->set_property = gtk_layout_set_property;
gobject_class->get_property = gtk_layout_get_property; gobject_class->get_property = gtk_layout_get_property;
@ -665,12 +673,15 @@ gtk_layout_class_init (GtkLayoutClass *class)
class->set_scroll_adjustments = gtk_layout_set_adjustments; class->set_scroll_adjustments = gtk_layout_set_adjustments;
widget_class->set_scroll_adjustments_signal = widget_class->set_scroll_adjustments_signal =
gtk_signal_new ("set_scroll_adjustments", g_signal_new ("set_scroll_adjustments",
GTK_RUN_LAST, G_OBJECT_CLASS_TYPE (gobject_class),
GTK_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
GTK_SIGNAL_OFFSET (GtkLayoutClass, set_scroll_adjustments), G_STRUCT_OFFSET (GtkLayoutClass, set_scroll_adjustments),
_gtk_marshal_VOID__OBJECT_OBJECT, NULL, NULL,
GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); _gtk_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT,
GTK_TYPE_ADJUSTMENT);
} }
static void static void

12
gtk/gtklayout.h
View File

@ -41,11 +41,11 @@ extern "C" {
#define GTK_TYPE_LAYOUT (gtk_layout_get_type ()) #define GTK_TYPE_LAYOUT (gtk_layout_get_type ())
#define GTK_LAYOUT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout)) #define GTK_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout))
#define GTK_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LAYOUT, GtkLayoutClass)) #define GTK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LAYOUT, GtkLayoutClass))
#define GTK_IS_LAYOUT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_LAYOUT)) #define GTK_IS_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LAYOUT))
#define GTK_IS_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LAYOUT)) #define GTK_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LAYOUT))
#define GTK_LAYOUT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass)) #define GTK_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass))
typedef struct _GtkLayout GtkLayout; typedef struct _GtkLayout GtkLayout;
@ -89,7 +89,7 @@ struct _GtkLayoutClass
void (*_gtk_reserved4) (void); void (*_gtk_reserved4) (void);
}; };
GtkType gtk_layout_get_type (void) G_GNUC_CONST; GType gtk_layout_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_layout_new (GtkAdjustment *hadjustment, GtkWidget* gtk_layout_new (GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment); GtkAdjustment *vadjustment);
void gtk_layout_put (GtkLayout *layout, void gtk_layout_put (GtkLayout *layout,

1011
gtk/gtkwidget.c
View File

File diff suppressed because it is too large Load Diff

16
gtk/gtkwidget.h
View File

@ -90,11 +90,11 @@ typedef enum
* Macros for testing whether `widget' or `klass' are of type GTK_TYPE_WIDGET. * Macros for testing whether `widget' or `klass' are of type GTK_TYPE_WIDGET.
*/ */
#define GTK_TYPE_WIDGET (gtk_widget_get_type ()) #define GTK_TYPE_WIDGET (gtk_widget_get_type ())
#define GTK_WIDGET(widget) (GTK_CHECK_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget)) #define GTK_WIDGET(widget) (G_TYPE_CHECK_INSTANCE_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget))
#define GTK_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET, GtkWidgetClass)) #define GTK_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET, GtkWidgetClass))
#define GTK_IS_WIDGET(widget) (GTK_CHECK_TYPE ((widget), GTK_TYPE_WIDGET)) #define GTK_IS_WIDGET(widget) (G_TYPE_CHECK_INSTANCE_TYPE ((widget), GTK_TYPE_WIDGET))
#define GTK_IS_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET)) #define GTK_IS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET))
#define GTK_WIDGET_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_WIDGET, GtkWidgetClass)) #define GTK_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WIDGET, GtkWidgetClass))
/* Macros for extracting various fields from GtkWidget and GtkWidgetClass. /* Macros for extracting various fields from GtkWidget and GtkWidgetClass.
*/ */
@ -426,8 +426,8 @@ struct _GtkWidgetShapeInfo
GdkBitmap *shape_mask; GdkBitmap *shape_mask;
}; };
GtkType gtk_widget_get_type (void) G_GNUC_CONST; GType gtk_widget_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_widget_new (GtkType type, GtkWidget* gtk_widget_new (GType type,
const gchar *first_property_name, const gchar *first_property_name,
...); ...);
GtkWidget* gtk_widget_ref (GtkWidget *widget); GtkWidget* gtk_widget_ref (GtkWidget *widget);
@ -576,7 +576,7 @@ void gtk_widget_set_extension_events (GtkWidget *widget,
GdkExtensionMode gtk_widget_get_extension_events (GtkWidget *widget); GdkExtensionMode gtk_widget_get_extension_events (GtkWidget *widget);
GtkWidget* gtk_widget_get_toplevel (GtkWidget *widget); GtkWidget* gtk_widget_get_toplevel (GtkWidget *widget);
GtkWidget* gtk_widget_get_ancestor (GtkWidget *widget, GtkWidget* gtk_widget_get_ancestor (GtkWidget *widget,
GtkType widget_type); GType widget_type);
GdkColormap* gtk_widget_get_colormap (GtkWidget *widget); GdkColormap* gtk_widget_get_colormap (GtkWidget *widget);
GdkVisual* gtk_widget_get_visual (GtkWidget *widget); GdkVisual* gtk_widget_get_visual (GtkWidget *widget);

4
modules/input/Makefile.am
View File

@ -9,6 +9,10 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \ @GTK_XIM_FLAGS@ \
@GTK_DEP_CFLAGS@ \ @GTK_DEP_CFLAGS@ \

4
modules/input/gtkimcontextxim.c
View File

@ -105,7 +105,7 @@ gtk_im_context_xim_register_type (GTypeModule *type_module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextXIM), sizeof (GtkIMContextXIM),
0, 0,
(GtkObjectInitFunc) gtk_im_context_xim_init, (GInstanceInitFunc) gtk_im_context_xim_init,
}; };
gtk_type_im_context_xim = gtk_type_im_context_xim =
@ -1223,7 +1223,7 @@ status_window_get (GtkIMContextXIM *context_xim,
window = status_window->window; 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); gtk_widget_set_app_paintable (window, TRUE);
status_label = gtk_label_new (""); status_label = gtk_label_new ("");

5
modules/input/imam-et.c
View File

@ -25,6 +25,7 @@
* *
*/ */
#include <stdio.h>
#include <string.h> #include <string.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -33,8 +34,6 @@
#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimcontextsimple.h"
#include "gtk/gtkimmodule.h" #include "gtk/gtkimmodule.h"
#include<stdio.h>
GType type_am_et_translit = 0; GType type_am_et_translit = 0;
static void am_et_class_init (GtkIMContextSimpleClass *class); static void am_et_class_init (GtkIMContextSimpleClass *class);
@ -53,7 +52,7 @@ am_et_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) am_et_init, (GInstanceInitFunc) am_et_init,
}; };
type_am_et_translit = type_am_et_translit =

2
modules/input/imcyrillic-translit.c
View File

@ -46,7 +46,7 @@ cyrillic_translit_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) cyrillic_translit_init, (GInstanceInitFunc) cyrillic_translit_init,
}; };
type_cyrillic_translit = type_cyrillic_translit =

2
modules/input/imhangul.c
View File

@ -49,7 +49,7 @@ hangul_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) hangul_init, (GInstanceInitFunc) hangul_init,
}; };
type_hangul = type_hangul =

2
modules/input/iminuktitut.c
View File

@ -49,7 +49,7 @@ inuktitut_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) inuktitut_init, (GInstanceInitFunc) inuktitut_init,
}; };
type_inuktitut_translit = type_inuktitut_translit =

2
modules/input/imipa.c
View File

@ -46,7 +46,7 @@ ipa_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) ipa_init, (GInstanceInitFunc) ipa_init,
}; };
type_ipa = type_ipa =

2
modules/input/imthai-broken.c
View File

@ -49,7 +49,7 @@ thai_broken_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) thai_broken_init, (GInstanceInitFunc) thai_broken_init,
}; };
type_thai_broken = type_thai_broken =

5
modules/input/imti-er.c
View File

@ -25,6 +25,7 @@
* *
*/ */
#include <stdio.h>
#include <string.h> #include <string.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -33,8 +34,6 @@
#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimcontextsimple.h"
#include "gtk/gtkimmodule.h" #include "gtk/gtkimmodule.h"
#include<stdio.h>
GType type_ti_er_translit = 0; GType type_ti_er_translit = 0;
static void ti_er_class_init (GtkIMContextSimpleClass *class); static void ti_er_class_init (GtkIMContextSimpleClass *class);
@ -53,7 +52,7 @@ ti_er_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) ti_er_init, (GInstanceInitFunc) ti_er_init,
}; };
type_ti_er_translit = type_ti_er_translit =

5
modules/input/imti-et.c
View File

@ -25,6 +25,7 @@
* *
*/ */
#include <stdio.h>
#include <string.h> #include <string.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -33,8 +34,6 @@
#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimcontextsimple.h"
#include "gtk/gtkimmodule.h" #include "gtk/gtkimmodule.h"
#include<stdio.h>
GType type_ti_et_translit = 0; GType type_ti_et_translit = 0;
static void ti_et_class_init (GtkIMContextSimpleClass *class); static void ti_et_class_init (GtkIMContextSimpleClass *class);
@ -53,7 +52,7 @@ ti_et_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) ti_et_init, (GInstanceInitFunc) ti_et_init,
}; };
type_ti_et_translit = type_ti_et_translit =

2
modules/input/imviqr.c
View File

@ -49,7 +49,7 @@ viqr_register_type (GTypeModule *module)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkIMContextSimple), sizeof (GtkIMContextSimple),
0, 0,
(GtkObjectInitFunc) viqr_init, (GInstanceInitFunc) viqr_init,
}; };
type_viqr_translit = type_viqr_translit =