Implement gtk_paned_get_handle_window

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

diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index f9568e481f3518cb3bc645c5897e3726cd228c4f..e6fc3dc5ad5f38195d5b245cc16a9db01e2b9f0e 100644 (file)
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -21,10 +21,10 @@
  * Modified by the GTK+ Team and others 1997-2001.  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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#include <config.h>
+#include "config.h"
 #include <math.h>
 #include "gtkarrow.h"
 #include "gtkprivate.h"
@@ -35,53 +35,25 @@
 
 enum {
   PROP_0,
-
   PROP_ARROW_TYPE,
-  PROP_SHADOW_TYPE,
-  
-  PROP_LAST
+  PROP_SHADOW_TYPE
 };
 
 
-static void gtk_arrow_class_init (GtkArrowClass  *klass);
-static void gtk_arrow_init       (GtkArrow       *arrow);
-static gint gtk_arrow_expose     (GtkWidget      *widget,
-                                 GdkEventExpose *event);
-static void gtk_arrow_set_property (GObject         *object,
-                                   guint            prop_id,
-                                   const GValue    *value,
-                                   GParamSpec      *pspec);
-static void gtk_arrow_get_property (GObject         *object,
-                                   guint            prop_id,
-                                   GValue          *value,
-                                   GParamSpec      *pspec);
-
-GType
-gtk_arrow_get_type (void)
-{
-  static GType arrow_type = 0;
+static void     gtk_arrow_set_property (GObject        *object,
+                                        guint           prop_id,
+                                        const GValue   *value,
+                                        GParamSpec     *pspec);
+static void     gtk_arrow_get_property (GObject        *object,
+                                        guint           prop_id,
+                                        GValue         *value,
+                                        GParamSpec     *pspec);
+static gboolean gtk_arrow_expose       (GtkWidget      *widget,
+                                        GdkEventExpose *event);
 
-  if (!arrow_type)
-    {
-      static const GTypeInfo arrow_info =
-      {
-       sizeof (GtkArrowClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_arrow_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkArrow),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_arrow_init,
-      };
-
-      arrow_type = g_type_register_static (GTK_TYPE_MISC, "GtkArrow",
-                                          &arrow_info, 0);
-    }
 
-  return arrow_type;
-}
+G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
+
 
 static void
 gtk_arrow_class_init (GtkArrowClass *class)
@@ -95,6 +67,8 @@ gtk_arrow_class_init (GtkArrowClass *class)
   gobject_class->set_property = gtk_arrow_set_property;
   gobject_class->get_property = gtk_arrow_get_property;
 
+  widget_class->expose_event = gtk_arrow_expose;
+
   g_object_class_install_property (gobject_class,
                                    PROP_ARROW_TYPE,
                                    g_param_spec_enum ("arrow-type",
@@ -103,6 +77,7 @@ gtk_arrow_class_init (GtkArrowClass *class)
                                                      GTK_TYPE_ARROW_TYPE,
                                                      GTK_ARROW_RIGHT,
                                                       GTK_PARAM_READWRITE));
+
   g_object_class_install_property (gobject_class,
                                    PROP_SHADOW_TYPE,
                                    g_param_spec_enum ("shadow-type",
@@ -111,8 +86,13 @@ gtk_arrow_class_init (GtkArrowClass *class)
                                                      GTK_TYPE_SHADOW_TYPE,
                                                      GTK_SHADOW_OUT,
                                                       GTK_PARAM_READWRITE));
-  
-  widget_class->expose_event = gtk_arrow_expose;
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_float ("arrow-scaling",
+                                                               P_("Arrow Scaling"),
+                                                               P_("Amount of space used up by arrow"),
+                                                               0.0, 1.0, 0.7,
+                                                               GTK_PARAM_READABLE));
 }
 
 static void
@@ -121,9 +101,7 @@ gtk_arrow_set_property (GObject         *object,
                        const GValue    *value,
                        GParamSpec      *pspec)
 {
-  GtkArrow *arrow;
-  
-  arrow = GTK_ARROW (object);
+  GtkArrow *arrow = GTK_ARROW (object);
 
   switch (prop_id)
     {
@@ -143,16 +121,14 @@ gtk_arrow_set_property (GObject         *object,
     }
 }
 
-
 static void
 gtk_arrow_get_property (GObject         *object,
                        guint            prop_id,
                        GValue          *value,
                        GParamSpec      *pspec)
 {
-  GtkArrow *arrow;
-  
-  arrow = GTK_ARROW (object);
+  GtkArrow *arrow = GTK_ARROW (object);
+
   switch (prop_id)
     {
     case PROP_ARROW_TYPE:
@@ -225,27 +201,27 @@ gtk_arrow_set (GtkArrow      *arrow,
 }
 
 
-static gboolean 
+static gboolean
 gtk_arrow_expose (GtkWidget      *widget,
                  GdkEventExpose *event)
 {
-  GtkArrow *arrow;
-  GtkMisc *misc;
-  GtkShadowType shadow_type;
-  gint width, height;
-  gint x, y;
-  gint extent;
-  gfloat xalign;
-  GtkArrowType effective_arrow_type;
-
   if (GTK_WIDGET_DRAWABLE (widget))
     {
-      arrow = GTK_ARROW (widget);
-      misc = GTK_MISC (widget);
+      GtkArrow *arrow = GTK_ARROW (widget);
+      GtkMisc *misc = GTK_MISC (widget);
+      GtkShadowType shadow_type;
+      gint width, height;
+      gint x, y;
+      gint extent;
+      gfloat xalign;
+      GtkArrowType effective_arrow_type;
+      gfloat arrow_scaling;
+
+      gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
 
       width = widget->allocation.width - misc->xpad * 2;
       height = widget->allocation.height - misc->ypad * 2;
-      extent = MIN (width, height) * 0.7;
+      extent = MIN (width, height) * arrow_scaling;
       effective_arrow_type = arrow->arrow_type;
 
       if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
@@ -260,12 +236,10 @@ gtk_arrow_expose (GtkWidget      *widget,
        }
 
       x = floor (widget->allocation.x + misc->xpad
-                + ((widget->allocation.width - extent) * xalign)
-                + 0.5);
-      y = floor (widget->allocation.y + misc->ypad 
-                + ((widget->allocation.height - extent) * misc->yalign)
-                + 0.5);
-      
+                + ((widget->allocation.width - extent) * xalign));
+      y = floor (widget->allocation.y + misc->ypad
+                + ((widget->allocation.height - extent) * misc->yalign));
+
       shadow_type = arrow->shadow_type;
 
       if (widget->state == GTK_STATE_ACTIVE)