add xthickness and ythickness to GtkRcStyle and add the necessary tokens.

Tue Jul 11 06:38:42 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtkrc.h: add xthickness and ythickness to GtkRcStyle and
        add the necessary tokens.

        * gtk/gtkrc.c (gtk_rc_style_init): properly initiality the rc style.
        (gtk_rc_style_to_style): copy thicknesses.
        (gtk_rc_init_style): apply thicknesses.
        (gtk_rc_parse_style): parse xthickness and ythickness.

        * gdk/x11/gdkdnd-x11.c: silence compiler in switch() statements.

        * gdk/x11/gdkwindow-x11.c (gdk_window_foreign_new):
        (gdk_window_new):
        (_gdk_windowing_window_init):
        * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new):
        (gdk_pixmap_create_from_data):
        (gdk_bitmap_create_from_data):
        (gdk_pixmap_new):
        * gdk/x11/gdkimage-x11.c (gdk_image_get):
        (gdk_image_new):
        * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new):
        * gdk/x11/gdkdnd-x11.c (gdk_drag_context_new):
        * gdk/x11/gdkcolor-x11.c (gdkx_colormap_get):
        (gdk_colormap_get_system):
        (gdk_colormap_new):
        * gdk/gdkwindow.c (gdk_window_init):
        * gtk/gtkstyle.c (gtk_style_new):
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done):
        * gdk/gdkpixmap.c (gdk_pixmap_init):
        * gtk/gtkrc.c (gtk_rc_style_new):
        use g_object_new() instead of g_type_create_instance() which
        is a private function for fundamental type implementations.

Tue Jul 11 06:20:14 2000  Tim Janik  <timj@gtk.org>

        * io-gif.c (gdk_pixbuf__gif_image_load_animation):
        * gdk-pixbuf-data.c (gdk_pixbuf_new_from_data):
        * gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file):
        use g_object_new() instead of g_type_create_instance() which
        is a private function for fundamental type implementations.

6 files changed, 21 insertions, 15 deletions

diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index d32f85451e..a21531efea 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -139,7 +139,7 @@ gdk_colormap_new (GdkVisual *visual,
   
   g_return_val_if_fail (visual != NULL, NULL);
 
-  colormap = GDK_COLORMAP (g_type_create_instance (gdk_colormap_get_type ()));
+  colormap = g_object_new (gdk_colormap_get_type (), NULL);
   private = GDK_COLORMAP_PRIVATE_DATA (colormap);
 
   colormap->visual = visual;
@@ -282,7 +282,7 @@ gdk_colormap_get_system (void)
 
   if (!colormap)
     {
-      colormap = GDK_COLORMAP (g_type_create_instance (gdk_colormap_get_type ()));
+      colormap = g_object_new (gdk_colormap_get_type (), NULL);
       private = GDK_COLORMAP_PRIVATE_DATA (colormap);
 
       private->xdisplay = gdk_display;
@@ -1001,7 +1001,7 @@ gdkx_colormap_get (Colormap xcolormap)
   if (xcolormap == DefaultColormap (gdk_display, gdk_screen))
     return gdk_colormap_get_system ();
 
-  colormap = GDK_COLORMAP (g_type_create_instance (gdk_colormap_get_type ()));
+  colormap = g_object_new (gdk_colormap_get_type (), NULL);
   private = GDK_COLORMAP_PRIVATE_DATA (colormap);
 
   private->xdisplay = gdk_display;
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 05faffd556..c657225966 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -215,7 +215,7 @@ gdk_drag_context_finalize (GObject *object)
 GdkDragContext *
 gdk_drag_context_new        (void)
 {
-  return GDK_DRAG_CONTEXT (g_type_create_instance (gdk_drag_context_get_type ()));
+  return g_object_new (gdk_drag_context_get_type (), NULL);
 }
 
 void            
@@ -2761,6 +2761,7 @@ gdk_drag_do_leave (GdkDragContext *context, guint32 time)
 	  break;
 	case GDK_DRAG_PROTO_ROOTWIN:
 	case GDK_DRAG_PROTO_NONE:
+	default:
 	  break;
 	}
 
@@ -2985,6 +2986,7 @@ gdk_drag_motion (GdkDragContext *context,
 
 	    case GDK_DRAG_PROTO_ROOTWIN:
 	    case GDK_DRAG_PROTO_NONE:
+	    default:
 	      break;
 	    }
 	  private->old_action = suggested_action;
@@ -3061,6 +3063,8 @@ gdk_drag_motion (GdkDragContext *context,
 	    case GDK_DRAG_PROTO_NONE:
 	      g_warning ("GDK_DRAG_PROTO_NONE is not valid in gdk_drag_motion()");
 	      break;
+	    default:
+	      break;
 	    }
 	}
       else
@@ -3095,6 +3099,8 @@ gdk_drag_drop (GdkDragContext *context,
 	case GDK_DRAG_PROTO_NONE:
 	  g_warning ("GDK_DRAG_PROTO_NONE is not valid in gdk_drag_drop()");
 	  break;
+	default:
+	  break;
 	}
     }
 }
diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index db8ba0e7dd..173e81f5c8 100644
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -128,7 +128,7 @@ _gdk_x11_gc_new (GdkDrawable      *drawable,
    */
   g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_X11 (drawable), NULL);
 
-  gc = GDK_GC (g_type_create_instance (gdk_gc_x11_get_type ()));
+  gc = g_object_new (gdk_gc_x11_get_type (), NULL);
   private = GDK_GC_X11 (gc);
 
   private->dirty_mask = 0;
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index ad42dc5831..c5218e3fc3 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -147,7 +147,7 @@ gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
   Visual *xvisual;
   GdkImage *image;
   GdkImagePrivateX11 *private;
-  image = GDK_IMAGE (g_type_create_instance (gdk_image_get_type ()));
+  image = g_object_new (gdk_image_get_type (), NULL);
   private = PRIVATE_DATA (image);
   private->xdisplay = gdk_display;
   image->type = GDK_IMAGE_NORMAL;
@@ -227,7 +227,7 @@ gdk_image_new (GdkImageType  type,
       break;
 
     default:
-      image = GDK_IMAGE (g_type_create_instance (gdk_image_get_type ()));
+      image = g_object_new (gdk_image_get_type (), NULL);
       
       private = PRIVATE_DATA (image);
 
@@ -386,7 +386,7 @@ gdk_image_get (GdkWindow *window,
   if (GDK_WINDOW_DESTROYED (window))
     return NULL;
 
-  image = GDK_IMAGE (g_type_create_instance (gdk_image_get_type ()));
+  image = g_object_new (gdk_image_get_type (), NULL);
   private = PRIVATE_DATA (image);
 
   private->xdisplay = gdk_display;
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 618c21fa5d..c0fd77404b 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -163,7 +163,7 @@ gdk_pixmap_new (GdkWindow *window,
   if (depth == -1)
     depth = gdk_drawable_get_depth (GDK_DRAWABLE (window));
 
-  pixmap = GDK_PIXMAP (g_type_create_instance (gdk_pixmap_get_type ()));
+  pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
   draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
   pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
   draw_impl->wrapper = GDK_DRAWABLE (pixmap);
@@ -203,7 +203,7 @@ gdk_bitmap_create_from_data (GdkWindow   *window,
   if (GDK_WINDOW_DESTROYED (window))
     return NULL;
 
-  pixmap = GDK_PIXMAP (g_type_create_instance (gdk_pixmap_get_type ()));
+  pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
   draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
   pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
   draw_impl->wrapper = GDK_DRAWABLE (pixmap);
@@ -252,7 +252,7 @@ gdk_pixmap_create_from_data (GdkWindow   *window,
   if (depth == -1)
     depth = gdk_drawable_get_visual (window)->depth;
 
-  pixmap = GDK_PIXMAP (g_type_create_instance (gdk_pixmap_get_type ()));
+  pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
   draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
   pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
   draw_impl->wrapper = GDK_DRAWABLE (pixmap);
@@ -297,7 +297,7 @@ gdk_pixmap_foreign_new (GdkNativeWindow anid)
 		    &x_ret, &y_ret, &w_ret, &h_ret, &bw_ret, &depth_ret))
       return NULL;
 
-  pixmap = GDK_PIXMAP (g_type_create_instance (gdk_pixmap_get_type ()));
+  pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
   draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
   pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
   draw_impl->wrapper = GDK_DRAWABLE (pixmap);
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 8f6964101a..7d21758c0a 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -253,7 +253,7 @@ _gdk_windowing_window_init (void)
 		&x, &y, &width, &height, &border_width, &depth);
   XGetWindowAttributes (gdk_display, gdk_root_window, &xattributes);
 
-  gdk_parent_root = GDK_WINDOW (g_type_create_instance (GDK_TYPE_WINDOW));
+  gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL);
   private = (GdkWindowObject *)gdk_parent_root;
   impl = GDK_WINDOW_IMPL_X11 (private->impl);
   draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl);
@@ -311,7 +311,7 @@ gdk_window_new (GdkWindow     *parent,
   
   xparent = GDK_WINDOW_XID (parent);
   
-  window = GDK_WINDOW (g_type_create_instance (GDK_TYPE_WINDOW));
+  window = g_object_new (GDK_TYPE_WINDOW, NULL);
   private = (GdkWindowObject *)window;
   impl = GDK_WINDOW_IMPL_X11 (private->impl);
   draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl);
@@ -591,7 +591,7 @@ gdk_window_foreign_new (GdkNativeWindow anid)
   if (children)
     XFree (children);
   
-  window = GDK_WINDOW (g_type_create_instance (GDK_TYPE_WINDOW));
+  window = g_object_new (GDK_TYPE_WINDOW, NULL);
   private = (GdkWindowObject *)window;
   impl = GDK_WINDOW_IMPL_X11 (private->impl);
   draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl);