Adapt cast macros to standard.

[~andy/gtk] / gtk / gtkpreview.c

diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c
index 8558ca13eef2af5bf7e6d70a227b9e51e6fd65d7..39d2618a0f3c0a49c4feb076c49f2f8a19f7bd40 100644 (file)
--- a/gtk/gtkpreview.c
+++ b/gtk/gtkpreview.c
@@ -17,11 +17,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
+
 #include <math.h>
 #include <string.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
-#include "gdk/gdkx.h"
+#endif
 #include "gdk/gdkrgb.h"
 #include "gtkpreview.h"
 #include "gtksignal.h"
@@ -29,9 +39,20 @@
 
 #define PREVIEW_CLASS(w)      GTK_PREVIEW_CLASS (GTK_OBJECT (w)->klass)
 
+enum {
+  ARG_0,
+  ARG_EXPAND
+};
+
 
 static void   gtk_preview_class_init    (GtkPreviewClass  *klass);
 static void   gtk_preview_init          (GtkPreview       *preview);
+static void   gtk_preview_set_arg      (GtkObject        *object,
+                                        GtkArg           *arg,
+                                        guint             arg_id);
+static void   gtk_preview_get_arg      (GtkObject        *object,
+                                        GtkArg           *arg,
+                                        guint             arg_id);
 static void   gtk_preview_finalize      (GtkObject        *object);
 static void   gtk_preview_realize       (GtkWidget        *widget);
 static void   gtk_preview_size_allocate (GtkWidget        *widget,
@@ -46,10 +67,10 @@ static GtkPreviewClass *preview_class = NULL;
 static gint install_cmap = FALSE;
 
 
-guint
+GtkType
 gtk_preview_get_type (void)
 {
-  static guint preview_type = 0;
+  static GtkType preview_type = 0;
 
   if (!preview_type)
     {
@@ -65,7 +86,7 @@ gtk_preview_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      preview_type = gtk_type_unique (gtk_widget_get_type (), &preview_info);
+      preview_type = gtk_type_unique (GTK_TYPE_WIDGET, &preview_info);
     }
 
   return preview_type;
@@ -80,9 +101,11 @@ gtk_preview_class_init (GtkPreviewClass *klass)
   object_class = (GtkObjectClass*) klass;
   widget_class = (GtkWidgetClass*) klass;
 
-  parent_class = gtk_type_class (gtk_widget_get_type ());
+  parent_class = gtk_type_class (GTK_TYPE_WIDGET);
   preview_class = klass;
 
+  object_class->set_arg = gtk_preview_set_arg;
+  object_class->get_arg = gtk_preview_get_arg;
   object_class->finalize = gtk_preview_finalize;
 
   widget_class->realize = gtk_preview_realize;
@@ -99,6 +122,46 @@ gtk_preview_class_init (GtkPreviewClass *klass)
   gdk_rgb_init ();
   klass->info.cmap = gdk_rgb_get_cmap ();
   klass->info.visual = gdk_rgb_get_visual ();
+
+  gtk_object_add_arg_type ("GtkPreview::expand",
+                          GTK_TYPE_BOOL,
+                          GTK_ARG_READWRITE,
+                          ARG_EXPAND);
+}
+
+static void
+gtk_preview_set_arg (GtkObject *object,
+                    GtkArg    *arg,
+                    guint      arg_id)
+{
+  GtkPreview *preview = GTK_PREVIEW (object);
+  
+  switch (arg_id)
+    {
+    case ARG_EXPAND:
+      gtk_preview_set_expand (preview, GTK_VALUE_BOOL (*arg));
+      break;
+    }
+}
+
+static void
+gtk_preview_get_arg (GtkObject *object,
+                    GtkArg    *arg,
+                    guint      arg_id)
+{
+  GtkPreview *preview;
+  
+  preview = GTK_PREVIEW (object);
+  
+  switch (arg_id)
+    {
+    case ARG_EXPAND:
+      GTK_VALUE_BOOL (*arg) = preview->expand;
+      break;
+    default:
+      arg->type = GTK_TYPE_INVALID;
+      break;
+    }
 }
 
 void
@@ -285,12 +348,18 @@ gtk_preview_draw_row (GtkPreview *preview,
 
 void
 gtk_preview_set_expand (GtkPreview *preview,
-                       gint        expand)
+                       gboolean    expand)
 {
   g_return_if_fail (preview != NULL);
   g_return_if_fail (GTK_IS_PREVIEW (preview));
 
-  preview->expand = (expand != FALSE);
+  expand = expand != FALSE;
+
+  if (preview->expand != expand)
+    {
+      preview->expand = expand;
+      gtk_widget_queue_resize (GTK_WIDGET (preview));
+    }
 }
 
 void
@@ -529,7 +598,7 @@ gtk_preview_make_buffer (GtkPreview *preview)
     }
 }
 
-/* This will be useful for implementing gamma. */
+/* This is used for implementing gamma. */
 static void
 gtk_fill_lookup_array (guchar *array)
 {