GNOME.org
 

[ghex] Remove GTK+ deprecated symbols

commit 870e03f80c2a9f6ec5fef5cd79fc9b39c46e2018
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Jan 27 09:24:33 2010 +0100

    Remove GTK+ deprecated symbols

 src/converter.c               |    6 ++----
 src/factory.c                 |    4 ++--
 src/gnome-print-font-dialog.c |    2 +-
 src/gnome-print-font-picker.h |   10 +++++-----
 src/gtkhex.c                  |    4 ++--
 src/gtkhex.h                  |   11 +++++++----
 src/hex-dialog.c              |    2 +-
 src/hex-document.c            |    6 +++++-
 src/preferences.c             |    4 ++--
 9 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/src/converter.c b/src/converter.c
index 0d78e7f..e05c76c 100644
--- a/src/converter.c
+++ b/src/converter.c
@@ -92,12 +92,10 @@ entry_filter(GtkEditable *editable, const gchar *text, gint length,
 	gdk_beep();
 	g_signal_stop_emission_by_name(G_OBJECT(editable), "insert_text");
 #if 0 /* Pasting is not working. gtk is doing weird things. Chema */
-	gtk_signal_handler_block_by_func(GTK_OBJECT(editable), entry_filter,
-									 data);
+	g_signal_handler_block_by_func (editable, entry_filter, data);
 	g_print("Inserting -->%s<--- of length %i in pos %i\n", s, l, *pos);
 	gtk_editable_insert_text(editable, s, l, pos);
-	gtk_signal_handler_unblock_by_func(GTK_OBJECT(editable), entry_filter,
-									   data);
+	g_signal_handler_unblock_by_func (editable, entry_filter, data);
 #endif 
 }
 
diff --git a/src/factory.c b/src/factory.c
index b3d82a9..6ad593a 100644
--- a/src/factory.c
+++ b/src/factory.c
@@ -29,7 +29,7 @@ setup_factory (void)
   /*
    * set up the factory only if GAIL is loaded.
    */
-  derived_type = g_type_parent (gtk_hex_get_type());
+  derived_type = g_type_parent (GTK_TYPE_HEX);
 
 
   if (is_gail_loaded (derived_type))
@@ -37,7 +37,7 @@ setup_factory (void)
       /* create the factory */
       default_registry = atk_get_default_registry();
       atk_registry_set_factory_type (default_registry,
-				     gtk_hex_get_type(),
+				     GTK_TYPE_HEX,
 				     ACCESSIBLE_TYPE_GTK_HEX_FACTORY);
     }
 }
diff --git a/src/gnome-print-font-dialog.c b/src/gnome-print-font-dialog.c
index c65e782..41240d5 100644
--- a/src/gnome-print-font-dialog.c
+++ b/src/gnome-print-font-dialog.c
@@ -148,7 +148,7 @@ gnome_print_font_dialog_class_init (GnomePrintFontDialogClass *klass)
   
 	object_class = (GtkObjectClass*) klass;
   
-	gfsd_parent_class = gtk_type_class (GTK_TYPE_DIALOG);
+	gfsd_parent_class = g_type_class_ref (GTK_TYPE_DIALOG);
 }
 
 static GtkWidget*
diff --git a/src/gnome-print-font-picker.h b/src/gnome-print-font-picker.h
index c174e93..310c3a8 100644
--- a/src/gnome-print-font-picker.h
+++ b/src/gnome-print-font-picker.h
@@ -63,11 +63,11 @@ typedef enum {
         
 
 #define GNOME_PRINT_TYPE_FONT_PICKER            (gnome_print_font_picker_get_type ())
-#define GNOME_PRINT_FONT_PICKER(obj)            (GTK_CHECK_CAST ((obj), GNOME_PRINT_TYPE_FONT_PICKER, GnomePrintFontPicker))
-#define GNOME_PRINT_FONT_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_PRINT_TYPE_FONT_PICKER, GnomePrintFontPickerClass))
-#define GNOME_PRINT_IS_FONT_PICKER(obj)         (GTK_CHECK_TYPE ((obj), GNOME_PRINT_TYPE_FONT_PICKER))
-#define GNOME_PRINT_IS_FONT_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_PRINT_TYPE_FONT_PICKER))
-#define GNOME_PRINT_FONT_PICKER_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GNOME_PRINT_TYPE_FONT_PICKER, GnomePrintFontPickerClass))
+#define GNOME_PRINT_FONT_PICKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_PRINT_TYPE_FONT_PICKER, GnomePrintFontPicker))
+#define GNOME_PRINT_FONT_PICKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_PRINT_TYPE_FONT_PICKER, GnomePrintFontPickerClass))
+#define GNOME_PRINT_IS_FONT_PICKER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_PRINT_TYPE_FONT_PICKER))
+#define GNOME_PRINT_IS_FONT_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_PRINT_TYPE_FONT_PICKER))
+#define GNOME_PRINT_FONT_PICKER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_PRINT_TYPE_FONT_PICKER, GnomePrintFontPickerClass))
 
 typedef struct _GnomePrintFontPicker        GnomePrintFontPicker;
 typedef struct _GnomePrintFontPickerPrivate GnomePrintFontPickerPrivate;
diff --git a/src/gtkhex.c b/src/gtkhex.c
index 15c0e4d..1e7fde3 100644
--- a/src/gtkhex.c
+++ b/src/gtkhex.c
@@ -1952,7 +1952,7 @@ static void gtk_hex_class_init(GtkHexClass *klass, gpointer data) {
 	/* Changed in Gnome 2.0 -- SnM */
 	G_OBJECT_CLASS(klass)->finalize = gtk_hex_finalize;
 
-	parent_class = gtk_type_class (gtk_fixed_get_type ());
+	parent_class = g_type_class_ref (gtk_fixed_get_type ());
 }
 
 static void gtk_hex_init(GtkHex *gh, gpointer klass) {
@@ -2081,7 +2081,7 @@ GType gtk_hex_get_type() {
 GtkWidget *gtk_hex_new(HexDocument *owner) {
 	GtkHex *gh;
 
-	gh = GTK_HEX (g_object_new (gtk_hex_get_type(), NULL));
+	gh = GTK_HEX (g_object_new (GTK_TYPE_HEX, NULL));
 	g_return_val_if_fail (gh != NULL, NULL);
 
 	gh->document = owner;
diff --git a/src/gtkhex.h b/src/gtkhex.h
index da8ee96..eadaed7 100644
--- a/src/gtkhex.h
+++ b/src/gtkhex.h
@@ -39,9 +39,12 @@ G_BEGIN_DECLS
 #define LOWER_NIBBLE TRUE
 #define UPPER_NIBBLE FALSE
 
-#define GTK_HEX(obj)          GTK_CHECK_CAST (obj, gtk_hex_get_type (), GtkHex)
-#define GTK_HEX_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_hex_get_type (), GtkHexClass)
-#define GTK_IS_HEX(obj)       GTK_CHECK_TYPE (obj, gtk_hex_get_type ())
+#define GTK_TYPE_HEX                    (gtk_hex_get_type ())
+#define GTK_HEX(obj)                    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HEX, GtkHex))
+#define GTK_HEX_CLASS(klass)            (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HEX, GtkHexClass))
+#define GTK_IS_HEX(obj)                 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HEX))
+#define GTK_IS_HEX_CLASS(klass)         (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HEX))
+#define GTK_HEX_GET_CLASS(obj)          (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HEX, GtkHexClass))
 
 typedef struct _GtkHex GtkHex;
 typedef struct _GtkHexClass GtkHexClass;
@@ -128,7 +131,7 @@ struct _GtkHexClass
 	void (*paste_clipboard)(GtkHex *);
 };
 
-GType gtk_hex_get_type(void);
+GType           gtk_hex_get_type                (void) G_GNUC_CONST;
 
 GtkWidget *gtk_hex_new(HexDocument *);
 
diff --git a/src/hex-dialog.c b/src/hex-dialog.c
index 5fcec16..f22e022 100644
--- a/src/hex-dialog.c
+++ b/src/hex-dialog.c
@@ -72,7 +72,7 @@ static struct {
 
 GType hex_dialog_get_type ()
 {
-    static GtkType doc_type = 0;
+    static GType doc_type = 0;
 
     if (doc_type == 0)
     {
diff --git a/src/hex-document.c b/src/hex-document.c
index 0a8f9cd..f4faea0 100644
--- a/src/hex-document.c
+++ b/src/hex-document.c
@@ -261,7 +261,11 @@ hex_document_add_view(HexDocument *doc)
 	
 	new_view = gtk_hex_new(doc);
 
+#if GTK_CHECK_VERSION (2,18,0)
+	gtk_widget_set_has_window (GTK_WIDGET (new_view), TRUE);
+#else
 	gtk_fixed_set_has_window (GTK_FIXED(new_view), TRUE);
+#endif
 
 	gtk_widget_ref(new_view);
 
@@ -386,7 +390,7 @@ hex_document_init (HexDocument *doc)
 GType
 hex_document_get_type (void)
 {
-	static GtkType doc_type = 0;
+	static GType doc_type = 0;
 	
 	if (!doc_type) {
 		static const GTypeInfo doc_info = {
diff --git a/src/preferences.c b/src/preferences.c
index 2c148b6..2c2ef72 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -188,8 +188,8 @@ create_prefs_dialog()
 	pui->font_button = gtk_font_button_new();
 	gtk_font_button_set_font_name(GTK_FONT_BUTTON(pui->font_button),
 								  def_font_name);
-	gtk_signal_connect (GTK_OBJECT (pui->font_button), "font-set",
-						GTK_SIGNAL_FUNC (select_display_font_cb), pui);
+	g_signal_connect (pui->font_button, "font-set",
+	                  G_CALLBACK (select_display_font_cb), pui);
 	flabel = gtk_label_new("");
 	gtk_label_set_mnemonic_widget (GTK_LABEL (flabel), pui->font_button);
 	gtk_widget_show(flabel);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]