modules/engines/ms-windows/msw_rc_style.c

Fri Nov 19 15:18:51 2004  Manish Singh  <yosh@gimp.org>

        * modules/engines/ms-windows/msw_rc_style.c
        * modules/engines/ms-windows/msw_style.c
        * modules/engines/ms-windows/msw_theme_main.c
        * modules/engines/pixbuf/pixbuf-main.c
        * modules/engines/pixbuf/pixbuf-rc-style.c
        * modules/input/gtkimcontextime.c
        * modules/input/gtkimcontextxim.c
        * modules/input/imam-et.c
        * modules/input/imcedilla.c
        * modules/input/imcyrillic-translit.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
        * tests/prop-editor.c
        * tests/testentrycompletion.c
        * tests/testfilechooser.c
        * tests/testmerge.c
        * tests/testtoolbar.c
        * tests/testtreecolumns.c
        * tests/testtreeview.c: get rid of unnecessary casts.

        * tests/testgtk.c (create_labels): add GTK_LABEL() casts for
        gtk_label_set_ellipsize() calls.

        * tests/testicontheme.c (main): remove unused pixbuf variable.

16 files changed, 26 insertions, 31 deletions

diff --git a/modules/engines/ms-windows/msw_rc_style.c b/modules/engines/ms-windows/msw_rc_style.c
index 22b8e158fd..a6b6a90ef4 100755
--- a/modules/engines/ms-windows/msw_rc_style.c
+++ b/modules/engines/ms-windows/msw_rc_style.c
@@ -73,6 +73,6 @@ msw_rc_style_class_init (MswRcStyleClass *klass)
 static GtkStyle *

 msw_rc_style_create_style (GtkRcStyle *rc_style)

 {

-  return GTK_STYLE (g_object_new (MSW_TYPE_STYLE, NULL));

+  return g_object_new (MSW_TYPE_STYLE, NULL);

 }

 

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 7a35635d0c..76e7089c5d 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -458,16 +458,13 @@ setup_menu_settings (GtkSettings * settings)
     if (SystemParametersInfo (SPI_GETMENUSHOWDELAY, 0, &menu_delay, 0)) {
       if (klazz) {
 	if (g_object_class_find_property (klazz, "gtk-menu-bar-popup-delay")) {
-	  g_object_set (G_OBJECT (settings), "gtk-menu-bar-popup-delay",
-			0, NULL);
+	  g_object_set (settings, "gtk-menu-bar-popup-delay", 0, NULL);
 	}
 	if (g_object_class_find_property (klazz, "gtk-menu-popup-delay")) {
-	  g_object_set (G_OBJECT (settings), "gtk-menu-popup-delay",
-			menu_delay, NULL);
+	  g_object_set (settings, "gtk-menu-popup-delay", menu_delay, NULL);
 	}
 	if (g_object_class_find_property (klazz, "gtk-menu-popdown-delay")) {
-	  g_object_set (G_OBJECT (settings), "gtk-menu-popdown-delay",
-			menu_delay, NULL);
+	  g_object_set (settings, "gtk-menu-popdown-delay", menu_delay, NULL);
 	}
       }
     }
@@ -485,19 +482,17 @@ msw_style_setup_system_settings (void)
     return;
 
   cursor_blink_time = GetCaretBlinkTime ();
-  g_object_set (G_OBJECT (settings), "gtk-cursor-blink",
-		        cursor_blink_time > 0, NULL);
+  g_object_set (settings, "gtk-cursor-blink", cursor_blink_time > 0, NULL);
 
   if (cursor_blink_time > 0)
   {
-  	g_object_set (G_OBJECT (settings), "gtk-cursor-blink-time",
-					2*cursor_blink_time, NULL);
+  	g_object_set (settings, "gtk-cursor-blink-time", 2*cursor_blink_time,
+		      NULL);
   }
 
-  g_object_set (G_OBJECT (settings), "gtk-double-click-time",
-		GetDoubleClickTime(), NULL);
-  g_object_set (G_OBJECT (settings), "gtk-dnd-drag-threshold",
-		GetSystemMetrics(SM_CXDRAG), NULL);
+  g_object_set (settings, "gtk-double-click-time", GetDoubleClickTime(), NULL);
+  g_object_set (settings, "gtk-dnd-drag-threshold", GetSystemMetrics(SM_CXDRAG),
+		NULL);
 
   setup_menu_settings (settings);
 
diff --git a/modules/engines/ms-windows/msw_theme_main.c b/modules/engines/ms-windows/msw_theme_main.c
index f3c5515f4a..858f506ae0 100755
--- a/modules/engines/ms-windows/msw_theme_main.c
+++ b/modules/engines/ms-windows/msw_theme_main.c
@@ -104,7 +104,7 @@ theme_exit (void)
 G_MODULE_EXPORT GtkRcStyle *

 theme_create_rc_style (void)

 {

-  return GTK_RC_STYLE (g_object_new (MSW_TYPE_RC_STYLE, NULL));

+  return g_object_new (MSW_TYPE_RC_STYLE, NULL);

 }

 

 /* The following function will be called by GTK+ when the module

diff --git a/modules/engines/pixbuf/pixbuf-main.c b/modules/engines/pixbuf/pixbuf-main.c
index 95d4525869..0b024598e8 100644
--- a/modules/engines/pixbuf/pixbuf-main.c
+++ b/modules/engines/pixbuf/pixbuf-main.c
@@ -40,7 +40,7 @@ theme_exit (void)
 G_MODULE_EXPORT GtkRcStyle *
 theme_create_rc_style (void)
 {
-  return GTK_RC_STYLE (g_object_new (PIXBUF_TYPE_RC_STYLE, NULL));  
+  return g_object_new (PIXBUF_TYPE_RC_STYLE, NULL);
 }
 
 /* The following function will be called by GTK+ when the module
diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index e90cee19ed..ef93363cee 100644
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -808,6 +808,6 @@ pixbuf_rc_style_merge (GtkRcStyle *dest,
 static GtkStyle *
 pixbuf_rc_style_create_style (GtkRcStyle *rc_style)
 {
-  return GTK_STYLE (g_object_new (PIXBUF_TYPE_STYLE, NULL));
+  return g_object_new (PIXBUF_TYPE_STYLE, NULL);
 }
 
diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index ad560925cd..da10077d83 100644
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -327,7 +327,7 @@ gtk_im_context_ime_filter_keypress (GtkIMContext *context,
       int len = g_unichar_to_utf8 (c, utf8);
       utf8[len] = 0;
 
-      g_signal_emit_by_name (G_OBJECT (context_ime), "commit", utf8);
+      g_signal_emit_by_name (context_ime, "commit", utf8);
       retval = TRUE;
     }
 
@@ -590,7 +590,7 @@ gtk_im_context_ime_focus_in (GtkIMContext *context)
   gdk_window_get_user_data (context_ime->client_window, (gpointer) & widget);
   if (GTK_IS_WIDGET (widget))
     {
-      g_signal_connect (G_OBJECT (widget), "hierarchy-changed",
+      g_signal_connect (widget, "hierarchy-changed",
                         G_CALLBACK (cb_client_widget_hierarchy_changed),
                         context_ime);
     }
@@ -969,7 +969,7 @@ gtk_im_context_ime_message_filter (GdkXEvent *xevent,
 
             if (utf8str)
               {
-                g_signal_emit_by_name (G_OBJECT (context), "commit", utf8str);
+                g_signal_emit_by_name (context, "commit", utf8str);
                 g_free (utf8str);
               }
           }
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 5b0bca3102..030440270b 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -633,7 +633,7 @@ gtk_im_context_xim_new (void)
   GtkIMContextXIM *result;
   const gchar *charset;
 
-  result = GTK_IM_CONTEXT_XIM (g_object_new (GTK_TYPE_IM_CONTEXT_XIM, NULL));
+  result = g_object_new (GTK_TYPE_IM_CONTEXT_XIM, NULL);
 
   result->locale = g_strdup (setlocale (LC_CTYPE, NULL));
   
diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c
index 1d4e8cf717..cabf03a638 100644
--- a/modules/input/imam-et.c
+++ b/modules/input/imam-et.c
@@ -484,7 +484,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "am_et") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_am_et_translit,NULL));
+    return g_object_new (type_am_et_translit, NULL);
   else
     return NULL;
 }
diff --git a/modules/input/imcedilla.c b/modules/input/imcedilla.c
index fa01526935..061bdedd73 100644
--- a/modules/input/imcedilla.c
+++ b/modules/input/imcedilla.c
@@ -121,7 +121,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "cedilla") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_cedilla, NULL));
+    return g_object_new (type_cedilla, NULL);
   else
     return NULL;
 }
diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index 12a0bc2289..b9c6c562bb 100644
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -247,7 +247,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "cyrillic_translit") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_cyrillic_translit, NULL));
+    return g_object_new (type_cyrillic_translit, NULL);
   else
     return NULL;
 }
diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c
index e9926ad526..b5ee5456da 100644
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -157,7 +157,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "inuktitut") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_inuktitut_translit, NULL));
+    return g_object_new (type_inuktitut_translit, NULL);
   else
     return NULL;
 }
diff --git a/modules/input/imipa.c b/modules/input/imipa.c
index 2c98c65626..c4a64023ee 100644
--- a/modules/input/imipa.c
+++ b/modules/input/imipa.c
@@ -175,7 +175,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "ipa") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_ipa, NULL));
+    return g_object_new (type_ipa, NULL);
   else
     return NULL;
 }
diff --git a/modules/input/imthai-broken.c b/modules/input/imthai-broken.c
index 9980bc32c8..56c870f7e1 100644
--- a/modules/input/imthai-broken.c
+++ b/modules/input/imthai-broken.c
@@ -208,7 +208,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "thai_broken") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_thai_broken, NULL));
+    return g_object_new (type_thai_broken, NULL);
   else
     return NULL;
 }
diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c
index dbc45b88c3..8c4b7c1043 100644
--- a/modules/input/imti-er.c
+++ b/modules/input/imti-er.c
@@ -483,7 +483,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "ti_er") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_ti_er_translit, NULL));
+    return g_object_new (type_ti_er_translit, NULL);
   else
     return NULL;
 }
diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c
index ec8408abc5..fdcb763cc7 100644
--- a/modules/input/imti-et.c
+++ b/modules/input/imti-et.c
@@ -483,7 +483,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "ti_et") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_ti_et_translit, NULL));
+    return g_object_new (type_ti_et_translit, NULL);
   else
     return NULL;
 }
diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c
index 8e03a0e63e..6d269ea1c7 100644
--- a/modules/input/imviqr.c
+++ b/modules/input/imviqr.c
@@ -274,7 +274,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "viqr") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_viqr_translit, NULL));
+    return g_object_new (type_viqr_translit, NULL);
   else
     return NULL;
 }