GNOME.org
 

gtkhtml r8873 - in trunk: . components/html-editor gtkhtml

Author: chpe
Date: Fri Jun 20 15:05:18 2008
New Revision: 8873
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8873&view=rev

Log:
	* components/html-editor/engine.h:
	* components/html-editor/gi-color-combo.h:
	* components/html-editor/gi-color-palette.h:
	* components/html-editor/gi-combo-box.h:
	* components/html-editor/html-stream-mem.h:
	* components/html-editor/htmlsourceview.c:
	* components/html-editor/htmlsourceview.h:
	* gtkhtml/gtkhtml-embedded.h:
	* gtkhtml/gtkhtml-properties.h:
	* gtkhtml/gtkhtml-propmanager.h:
	* gtkhtml/htmlframe.c: (html_frame_init):
	* gtkhtml/htmliframe.c: (html_iframe_init):
	* gtkhtml/htmlplainpainter.h:
	* gtkhtml/htmlprinter.h:
	* gtkhtml/htmltokenizer.c: (html_tokenizer_get_type): Don't use
	deprecated gtk type macros. Bug #539289.

Modified:
   trunk/ChangeLog
   trunk/components/html-editor/engine.h
   trunk/components/html-editor/gi-color-combo.h
   trunk/components/html-editor/gi-color-palette.h
   trunk/components/html-editor/gi-combo-box.h
   trunk/components/html-editor/html-stream-mem.h
   trunk/components/html-editor/htmlsourceview.c
   trunk/components/html-editor/htmlsourceview.h
   trunk/gtkhtml/gtkhtml-embedded.h
   trunk/gtkhtml/gtkhtml-properties.h
   trunk/gtkhtml/gtkhtml-propmanager.h
   trunk/gtkhtml/htmlframe.c
   trunk/gtkhtml/htmliframe.c
   trunk/gtkhtml/htmlplainpainter.h
   trunk/gtkhtml/htmlprinter.h
   trunk/gtkhtml/htmltokenizer.c

Modified: trunk/components/html-editor/engine.h
==============================================================================
--- trunk/components/html-editor/engine.h	(original)
+++ trunk/components/html-editor/engine.h	Fri Jun 20 15:05:18 2008
@@ -34,10 +34,10 @@
 #include "gtkhtml.h"
 
 #define EDITOR_ENGINE_TYPE        (editor_engine_get_type ())
-#define EDITOR_ENGINE(o)          (GTK_CHECK_CAST ((o), EDITOR_ENGINE_TYPE, EditorEngine))
-#define EDITOR_ENGINE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), EDITOR_ENGINE_TYPE, EditorEngineClass))
-#define IS_EDITOR_ENGINE(o)       (GTK_CHECK_TYPE ((o), EDITOR_ENGINE_TYPE))
-#define IS_EDITOR_ENGINE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), EDITOR_ENGINE_TYPE))
+#define EDITOR_ENGINE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EDITOR_ENGINE_TYPE, EditorEngine))
+#define EDITOR_ENGINE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), EDITOR_ENGINE_TYPE, EditorEngineClass))
+#define IS_EDITOR_ENGINE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EDITOR_ENGINE_TYPE))
+#define IS_EDITOR_ENGINE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EDITOR_ENGINE_TYPE))
 
 struct _EditorEngine {
 	BonoboObject parent;
@@ -52,7 +52,7 @@
 	POA_GNOME_GtkHTML_Editor_Engine__epv epv;
 } EditorEngineClass;
 
-GtkType                               editor_engine_get_type   (void);
+GType                               editor_engine_get_type   (void);
 EditorEngine                         *editor_engine_new        (GtkHTMLControlData          *cd);
 POA_GNOME_GtkHTML_Editor_Engine__epv *editor_engine_get_epv    (void);
 

Modified: trunk/components/html-editor/gi-color-combo.h
==============================================================================
--- trunk/components/html-editor/gi-color-combo.h	(original)
+++ trunk/components/html-editor/gi-color-combo.h	Fri Jun 20 15:05:18 2008
@@ -65,7 +65,7 @@
 #define GI_COLOR_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), GI_COLOR_COMBO_TYPE)
 #define IS_GI_COLOR_COMBO(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GI_COLOR_COMBO_TYPE))
 
-GtkType    gi_color_combo_get_type   (void);
+GType    gi_color_combo_get_type   (void);
 GtkWidget *gi_color_combo_new        (GdkPixbuf   *icon,
 				      char  const *no_color_label,
 				      GdkColor    *default_color,

Modified: trunk/components/html-editor/gi-color-palette.h
==============================================================================
--- trunk/components/html-editor/gi-color-palette.h	(original)
+++ trunk/components/html-editor/gi-color-palette.h	Fri Jun 20 15:05:18 2008
@@ -86,7 +86,7 @@
 #define COLOR_PALETTE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), COLOR_PALETTE_TYPE)
 #define IS_COLOR_PALETTE(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), COLOR_PALETTE_TYPE))
 
-GtkType         color_palette_get_type (void);
+GType         color_palette_get_type (void);
 
 GtkWidget       *color_palette_new (const char *no_color_label,
 				    GdkColor *default_color,

Modified: trunk/components/html-editor/gi-combo-box.h
==============================================================================
--- trunk/components/html-editor/gi-combo-box.h	(original)
+++ trunk/components/html-editor/gi-combo-box.h	Fri Jun 20 15:05:18 2008
@@ -60,7 +60,7 @@
 	void      (*post_pop_hide)    (GiComboBox *cbox);
 };
 
-GtkType    gi_combo_box_get_type    (void);
+GType    gi_combo_box_get_type    (void);
 void       gi_combo_box_construct   (GiComboBox *combo_box,
 				      GtkWidget   *display_widget,
 				      GtkWidget   *optional_pop_down_widget);

Modified: trunk/components/html-editor/html-stream-mem.h
==============================================================================
--- trunk/components/html-editor/html-stream-mem.h	(original)
+++ trunk/components/html-editor/html-stream-mem.h	Fri Jun 20 15:05:18 2008
@@ -15,10 +15,10 @@
 typedef struct _HTMLStreamMemClass HTMLStreamMemClass;
 
 #define HTML_STREAM_MEM_TYPE          (html_stream_mem_get_type ())
-#define HTML_STREAM_MEM(o)            (GTK_CHECK_CAST ((o), HTML_STREAM_MEM_TYPE, HTMLStreamMem))
-#define HTML_STREAM_MEM_CLASS(k)      (GTK_CHECK_CLASS_CAST((k), HTML_STREAM_MEM_TYPE, HTMLStreamMemClass))
-#define HTML_IS_STREAM_MEM(o)         (GTK_CHECK_TYPE ((o), HTML_STREAM_MEM_TYPE))
-#define HTML_IS_STREAM_MEM_CLASS(k)   (GTK_CHECK_CLASS_TYPE ((k), HTML_STREAM_MEM_TYPE))
+#define HTML_STREAM_MEM(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), HTML_STREAM_MEM_TYPE, HTMLStreamMem))
+#define HTML_STREAM_MEM_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), HTML_STREAM_MEM_TYPE, HTMLStreamMemClass))
+#define HTML_IS_STREAM_MEM(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), HTML_STREAM_MEM_TYPE))
+#define HTML_IS_STREAM_MEM_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), HTML_STREAM_MEM_TYPE))
 
 struct _HTMLStreamMem {
 	BonoboObject  bonobo_object;
@@ -31,7 +31,7 @@
 	POA_Bonobo_Stream__epv epv;
 };
 
-GtkType         html_stream_mem_get_type     (void);
+GType         html_stream_mem_get_type     (void);
 BonoboObject   *html_stream_mem_create       (GtkHTMLStream *html_stream);
 HTMLStreamMem  *html_stream_mem_constuct     (HTMLStreamMem *bhtml, GtkHTMLStream *html_stream);
 

Modified: trunk/components/html-editor/htmlsourceview.c
==============================================================================
--- trunk/components/html-editor/htmlsourceview.c	(original)
+++ trunk/components/html-editor/htmlsourceview.c	Fri Jun 20 15:05:18 2008
@@ -238,7 +238,7 @@
 	klass->update = html_source_view_real_update;
 }
 
-GtkType
+GType
 html_source_view_get_type (void)
 {
 	static GType view_type = 0;

Modified: trunk/components/html-editor/htmlsourceview.h
==============================================================================
--- trunk/components/html-editor/htmlsourceview.h	(original)
+++ trunk/components/html-editor/htmlsourceview.h	Fri Jun 20 15:05:18 2008
@@ -27,9 +27,9 @@
 #include "gtkhtml.h"
 
 #define HTML_TYPE_SOURCE_VIEW                    (html_source_view_get_type ())
-#define HTML_SOURCE_VIEW(w)                      (GTK_CHECK_CAST ((w), HTML_TYPE_SOURCE_VIEW, HTMLSourceView))
-#define HTML_SOURCE_VIEW_CLASS(klass)            (GTK_CHECK_CLASS_CAST ((klass), HTML_TYPE_SOURCE_VIEW, HTMLSourceViewClass))
-#define HTML_IS_SOURCE_VIEW(w)                   (GTK_CHECK_TYPE ((w), HTML_TYPE_SOURCE_VIEW))
+#define HTML_SOURCE_VIEW(w)                      (G_TYPE_CHECK_INSTANCE_CAST ((w), HTML_TYPE_SOURCE_VIEW, HTMLSourceView))
+#define HTML_SOURCE_VIEW_CLASS(klass)            (G_TYPE_CHECK_CLASS_CAST ((klass), HTML_TYPE_SOURCE_VIEW, HTMLSourceViewClass))
+#define HTML_IS_SOURCE_VIEW(w)                   (G_TYPE_CHECK_INSTANCE_TYPE ((w), HTML_TYPE_SOURCE_VIEW))
 
 typedef struct _HTMLSourceViewPrivate HTMLSourceViewPrivate;
 typedef struct _HTMLSourceViewClass HTMLSourceViewClass;
@@ -47,7 +47,7 @@
 	void (*update)(HTMLSourceView *);
 };
 
-GtkType        html_source_view_get_type        (void);
+GType        html_source_view_get_type        (void);
 GtkWidget *    html_source_view_new             (void);
 
 void           html_source_view_set_timeout     (HTMLSourceView *view, guint timeout);

Modified: trunk/gtkhtml/gtkhtml-embedded.h
==============================================================================
--- trunk/gtkhtml/gtkhtml-embedded.h	(original)
+++ trunk/gtkhtml/gtkhtml-embedded.h	Fri Jun 20 15:05:18 2008
@@ -28,9 +28,9 @@
 #include "gtkhtml-types.h"
 
 #define GTK_TYPE_HTML_EMBEDDED         (gtk_html_embedded_get_type ())
-#define GTK_HTML_EMBEDDED(obj)         GTK_CHECK_CAST (obj, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbedded)
-#define GTK_HTML_EMBEDDED_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbeddedClass)
-#define GTK_IS_HTML_EMBEDDED(obj)      GTK_CHECK_TYPE (obj, GTK_TYPE_HTML_EMBEDDED)
+#define GTK_HTML_EMBEDDED(obj)         G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbedded)
+#define GTK_HTML_EMBEDDED_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbeddedClass)
+#define GTK_IS_HTML_EMBEDDED(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_HTML_EMBEDDED)
 
 struct _GtkHTMLEmbedded {
 	GtkBin bin;

Modified: trunk/gtkhtml/gtkhtml-properties.h
==============================================================================
--- trunk/gtkhtml/gtkhtml-properties.h	(original)
+++ trunk/gtkhtml/gtkhtml-properties.h	Fri Jun 20 15:05:18 2008
@@ -62,7 +62,7 @@
 #define GTK_TYPE_HTML_CURSOR_SKIP     (gtk_html_cursor_skip_get_type ())
 #define GTK_TYPE_HTML_COMMAND         (gtk_html_command_get_type ())
 
-GtkType gtk_html_cursor_skip_get_type (void);
-GtkType gtk_html_command_get_type     (void);
+GType gtk_html_cursor_skip_get_type (void);
+GType gtk_html_command_get_type     (void);
 
 #endif

Modified: trunk/gtkhtml/gtkhtml-propmanager.h
==============================================================================
--- trunk/gtkhtml/gtkhtml-propmanager.h	(original)
+++ trunk/gtkhtml/gtkhtml-propmanager.h	Fri Jun 20 15:05:18 2008
@@ -28,10 +28,10 @@
 #include "gtkhtml-properties.h"
 
 #define GTK_TYPE_HTML_PROPMANAGER                (gtk_html_propmanager_get_type ())
-#define GTK_HTML_PROPMANAGER(w)                  (GTK_CHECK_CAST ((w), GTK_TYPE_HTML_PROPMANAGER, GtkHTMLPropmanager))
-#define GTK_HTML_PROPMANAGER_CLASS(klass)        (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HTML_PROPMANAGER, GtkHTMLPropmanagerClass))
+#define GTK_HTML_PROPMANAGER(w)                  (G_TYPE_CHECK_INSTANCE_CAST ((w), GTK_TYPE_HTML_PROPMANAGER, GtkHTMLPropmanager))
+#define GTK_HTML_PROPMANAGER_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HTML_PROPMANAGER, GtkHTMLPropmanagerClass))
 
-#define GTK_IS_HTML_PROPMANAGER(w)               (GTK_CHECK_TYPE ((w), GTK_TYPE_HTML_PROPMANAGER))
+#define GTK_IS_HTML_PROPMANAGER(w)               (G_TYPE_CHECK_INSTANCE_TYPE ((w), GTK_TYPE_HTML_PROPMANAGER))
 
 typedef struct _GtkHTMLPropmanagerPrivate GtkHTMLPropmanagerPrivate;
 typedef struct _GtkHTMLPropmanagerClass GtkHTMLPropmanagerClass;
@@ -50,7 +50,7 @@
 	void (*changed)(GtkHTMLPropmanager *);
 };
 
-GtkType          gtk_html_propmanager_get_type (void);
+GType          gtk_html_propmanager_get_type (void);
 GObject *        gtk_html_propmanager_new (GConfClient *client);
 gboolean         gtk_html_propmanager_set_gui (GtkHTMLPropmanager *pman, GladeXML *xml, GHashTable *nametable);
 void             gtk_html_propmanager_apply (GtkHTMLPropmanager *pman);

Modified: trunk/gtkhtml/htmlframe.c
==============================================================================
--- trunk/gtkhtml/htmlframe.c	(original)
+++ trunk/gtkhtml/htmlframe.c	Fri Jun 20 15:05:18 2008
@@ -511,10 +511,10 @@
 	 * proxied like url_requested is.
 	 */
 	gtk_signal_connect (GTK_OBJECT (new_html), "on_url",
-			    GTK_SIGNAL_FUNC (frame_on_url),
+			    G_CALLBACK (frame_on_url),
 			    (gpointer)frame);
 	gtk_signal_connect (GTK_OBJECT (new_html), "link_clicked",
-			    GTK_SIGNAL_FUNC (frame_link_clicked),
+			    G_CALLBACK (frame_link_clicked),
 			    (gpointer)frame);
 #endif
 	g_signal_connect (new_html, "size_changed", G_CALLBACK (frame_size_changed), frame);
@@ -527,7 +527,7 @@
 
 	/*
 	  gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
-	  GTK_SIGNAL_FUNC (frame_button_press_event), frame);
+	  G_CALLBACK (frame_button_press_event), frame);
 	*/
 
 	gtk_widget_set_size_request (scrolled_window, width, height);

Modified: trunk/gtkhtml/htmliframe.c
==============================================================================
--- trunk/gtkhtml/htmliframe.c	(original)
+++ trunk/gtkhtml/htmliframe.c	Fri Jun 20 15:05:18 2008
@@ -646,10 +646,10 @@
 	 * proxied like url_requested is.
 	 */
 	gtk_signal_connect (GTK_OBJECT (new_html), "on_url",
-			    GTK_SIGNAL_FUNC (iframe_on_url),
+			    G_CALLBACK (iframe_on_url),
 			    (gpointer)iframe);
 	gtk_signal_connect (GTK_OBJECT (new_html), "link_clicked",
-			    GTK_SIGNAL_FUNC (iframe_link_clicked),
+			    G_CALLBACK (iframe_link_clicked),
 			    (gpointer)iframe);
 #endif
 	g_signal_connect (new_html, "size_changed", G_CALLBACK (iframe_size_changed), iframe);
@@ -658,7 +658,7 @@
 
 	/*
 	  gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
-	  GTK_SIGNAL_FUNC (iframe_button_press_event), iframe);
+	  G_CALLBACK (iframe_button_press_event), iframe);
 	*/
 
 	gtk_widget_set_size_request (scrolled_window, width, height);
@@ -677,13 +677,13 @@
 	html_painter_set_focus (new_html->engine->painter, parent_html->engine->have_focus);
 	/*
 	gtk_signal_connect (GTK_OBJECT (html), "title_changed",
-			    GTK_SIGNAL_FUNC (title_changed_cb), (gpointer)app);
+			    G_CALLBACK (title_changed_cb), (gpointer)app);
 	gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
-			    GTK_SIGNAL_FUNC (on_button_press_event), popup_menu);
+			    G_CALLBACK (on_button_press_event), popup_menu);
 	gtk_signal_connect (GTK_OBJECT (html), "redirect",
-			    GTK_SIGNAL_FUNC (on_redirect), NULL);
+			    G_CALLBACK (on_redirect), NULL);
 	gtk_signal_connect (GTK_OBJECT (html), "object_requested",
-			    GTK_SIGNAL_FUNC (object_requested_cmd), NULL);
+			    G_CALLBACK (object_requested_cmd), NULL);
 	*/
 }
 

Modified: trunk/gtkhtml/htmlplainpainter.h
==============================================================================
--- trunk/gtkhtml/htmlplainpainter.h	(original)
+++ trunk/gtkhtml/htmlplainpainter.h	Fri Jun 20 15:05:18 2008
@@ -44,7 +44,7 @@
 	HTMLGdkPainterClass base;
 };
 
-GtkType      html_plain_painter_get_type (void);
+GType      html_plain_painter_get_type (void);
 HTMLPainter *html_plain_painter_new      (GtkWidget *widget, gboolean double_buffer);
 
 #endif /* _HTMLPLAINPAINTER_H */

Modified: trunk/gtkhtml/htmlprinter.h
==============================================================================
--- trunk/gtkhtml/htmlprinter.h	(original)
+++ trunk/gtkhtml/htmlprinter.h	Fri Jun 20 15:05:18 2008
@@ -48,7 +48,7 @@
 	HTMLPainterClass base;
 };
 
-GtkType      html_printer_get_type                    (void);
+GType      html_printer_get_type                    (void);
 HTMLPainter *html_printer_new                         (GtkWidget         *widget,
 						       GtkPrintContext *context);
 guint        html_printer_get_page_width              (HTMLPrinter       *printer);

Modified: trunk/gtkhtml/htmltokenizer.c
==============================================================================
--- trunk/gtkhtml/htmltokenizer.c	(original)
+++ trunk/gtkhtml/htmltokenizer.c	Fri Jun 20 15:05:18 2008
@@ -265,10 +265,10 @@
         G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
-GtkType
+GType
 html_tokenizer_get_type (void)
 {
-	static GtkType html_tokenizer_type = 0;
+	static GType html_tokenizer_type = 0;
 
 	if (!html_tokenizer_type) {
 		static const GTypeInfo html_tokenizer_info = {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]