Whitespace changes only.

[pspp-builds.git] / src / ui / gui / customentry.c

diff --git a/src/ui/gui/customentry.c b/src/ui/gui/customentry.c
index 9afe978c2e50dfc97192e0ed774c4224cf644e3c..2d8f9a0e29b8e91ea9f0f4a452625b0861d17d9f 100644 (file)
--- a/src/ui/gui/customentry.c
+++ b/src/ui/gui/customentry.c
@@ -1,7 +1,6 @@
-/* 
+/*

    PSPPIRE --- A Graphical User Interface for PSPP
    Copyright (C) 2005  Free Software Foundation
    PSPPIRE --- A Graphical User Interface for PSPP
    Copyright (C) 2005  Free Software Foundation

-   Written by John Darrington

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -16,11 +15,11 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

-   02110-1301, USA. 
+   02110-1301, USA.

 */
 
 */
 

-/* 
-   This widget is a subclass of GtkEntry.  It's an entry widget with a 
+/*
+   This widget is a subclass of GtkEntry.  It's an entry widget with a

    button on the right hand side.
 
    This code is heavily based upon the GtkSpinButton widget.  Therefore
    button on the right hand side.
 
    This code is heavily based upon the GtkSpinButton widget.  Therefore


@@ -55,14 +54,18 @@
  * Modified by the GTK+ Team and others 1997-2000.  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
  * Modified by the GTK+ Team and others 1997-2000.  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 <gettext.h>
+#define _(msgid) gettext (msgid)
+
+

 #include <gtk/gtksignal.h>
 #include <gtk/gtkentry.h>
 #include "customentry.h"
 
 #include <gtk/gtksignal.h>
 #include <gtk/gtkentry.h>
 #include "customentry.h"
 

-#define P_(A) A

 
 static void psppire_custom_entry_class_init          (PsppireCustomEntryClass *klass);
 static void psppire_custom_entry_init                (PsppireCustomEntry      *ce);
 
 static void psppire_custom_entry_class_init          (PsppireCustomEntryClass *klass);
 static void psppire_custom_entry_init                (PsppireCustomEntry      *ce);


@@ -100,7 +103,7 @@ psppire_custom_entry_get_type (void)
          (GInstanceInitFunc) psppire_custom_entry_init,
        };
 
          (GInstanceInitFunc) psppire_custom_entry_init,
        };
 

-      ce_type = g_type_register_static (GTK_TYPE_ENTRY, "PsppireCustomEntry", 
+      ce_type = g_type_register_static (GTK_TYPE_ENTRY, "PsppireCustomEntry",

                                        &ce_info, 0);
     }
 
                                        &ce_info, 0);
     }
 


@@ -150,14 +153,14 @@ psppire_custom_entry_realize (GtkWidget *widget)
   GTK_WIDGET_CLASS (parent_class)->realize (widget);
 
   widget->allocation.width = real_width;
   GTK_WIDGET_CLASS (parent_class)->realize (widget);
 
   widget->allocation.width = real_width;

-  
+

   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
   attributes.event_mask = gtk_widget_get_events (widget);
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
   attributes.event_mask = gtk_widget_get_events (widget);

-  attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK 
-    | GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK 
+  attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK
+    | GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK

     | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
     | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;


@@ -169,8 +172,8 @@ psppire_custom_entry_realize (GtkWidget *widget)
                                         widget->requisition.height) / 2;
   attributes.width = button_size + 2 * widget->style->xthickness;
   attributes.height = widget->requisition.height;
                                         widget->requisition.height) / 2;
   attributes.width = button_size + 2 * widget->style->xthickness;
   attributes.height = widget->requisition.height;

-  
-  custom_entry->panel = gdk_window_new (gtk_widget_get_parent_window (widget), 
+
+  custom_entry->panel = gdk_window_new (gtk_widget_get_parent_window (widget),

                                        &attributes, attributes_mask);
   gdk_window_set_user_data (custom_entry->panel, widget);
 
                                        &attributes, attributes_mask);
   gdk_window_set_user_data (custom_entry->panel, widget);
 


@@ -186,7 +189,7 @@ psppire_custom_entry_realize (GtkWidget *widget)
 static gint
 psppire_custom_entry_get_button_width (PsppireCustomEntry *custom_entry)
 {
 static gint
 psppire_custom_entry_get_button_width (PsppireCustomEntry *custom_entry)
 {

-  const gint size = pango_font_description_get_size 
+  const gint size = pango_font_description_get_size

     (GTK_WIDGET (custom_entry)->style->font_desc);
 
   gint button_width = MAX (PANGO_PIXELS (size), MIN_BUTTON_WIDTH);
     (GTK_WIDGET (custom_entry)->style->font_desc);
 
   gint button_width = MAX (PANGO_PIXELS (size), MIN_BUTTON_WIDTH);


@@ -197,10 +200,10 @@ psppire_custom_entry_get_button_width (PsppireCustomEntry *custom_entry)
 /**
  * custom_entry_get_shadow_type:
  * @custom_entry: a #PsppireCustomEntry
 /**
  * custom_entry_get_shadow_type:
  * @custom_entry: a #PsppireCustomEntry

- * 
+ *

  * Convenience function to Get the shadow type from the underlying widget's
  * style.
  * Convenience function to Get the shadow type from the underlying widget's
  * style.

- * 
+ *

  * Return value: the #GtkShadowType
  **/
 static gint
  * Return value: the #GtkShadowType
  **/
 static gint


@@ -246,18 +249,18 @@ psppire_custom_entry_redraw (PsppireCustomEntry *custom_entry)
        */
       gdk_window_invalidate_rect (custom_entry->panel, NULL, TRUE);
     }
        */
       gdk_window_invalidate_rect (custom_entry->panel, NULL, TRUE);
     }

-}        
+}

 
 
 static gint
 psppire_custom_entry_expose (GtkWidget      *widget,
                     GdkEventExpose *event)
 {
 
 
 static gint
 psppire_custom_entry_expose (GtkWidget      *widget,
                     GdkEventExpose *event)
 {

+  PsppireCustomEntry *ce = PSPPIRE_CUSTOM_ENTRY (widget);
+

   g_return_val_if_fail (PSPPIRE_IS_CUSTOM_ENTRY (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
   g_return_val_if_fail (PSPPIRE_IS_CUSTOM_ENTRY (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 

-  PsppireCustomEntry *ce = PSPPIRE_CUSTOM_ENTRY(widget);
-

   if (GTK_WIDGET_DRAWABLE (widget))
     {
       GtkShadowType shadow_type;
   if (GTK_WIDGET_DRAWABLE (widget))
     {
       GtkShadowType shadow_type;


@@ -271,11 +274,11 @@ psppire_custom_entry_expose (GtkWidget      *widget,
 
       gdk_drawable_get_size (ce->panel, &rect.width, &rect.height);
 
 
       gdk_drawable_get_size (ce->panel, &rect.width, &rect.height);
 

-      gdk_window_begin_paint_rect (ce->panel, &rect);      
+      gdk_window_begin_paint_rect (ce->panel, &rect);

 
 
       shadow_type = psppire_custom_entry_get_shadow_type (ce);
 
 
       shadow_type = psppire_custom_entry_get_shadow_type (ce);

-      
+

       if (shadow_type != GTK_SHADOW_NONE)
        {
          gtk_paint_box (widget->style, ce->panel,
       if (shadow_type != GTK_SHADOW_NONE)
        {
          gtk_paint_box (widget->style, ce->panel,


@@ -327,24 +330,24 @@ psppire_custom_entry_class_init (PsppireCustomEntryClass *klass)
   widget_class->size_allocate = psppire_custom_entry_size_allocate;
 
 
   widget_class->size_allocate = psppire_custom_entry_size_allocate;
 
 

-  gtk_widget_class_install_style_property_parser 
+  gtk_widget_class_install_style_property_parser

     (widget_class,
     (widget_class,

-     g_param_spec_enum ("shadow_type", 
-                       "Shadow Type", 
-                       P_("Style of bevel around the custom entry button"),
+     g_param_spec_enum ("shadow_type",
+                       "Shadow Type",
+                       _("Style of bevel around the custom entry button"),

                        GTK_TYPE_SHADOW_TYPE,
                        GTK_SHADOW_ETCHED_IN,
                        G_PARAM_READABLE),
      gtk_rc_property_parse_enum);
 
                        GTK_TYPE_SHADOW_TYPE,
                        GTK_SHADOW_ETCHED_IN,
                        G_PARAM_READABLE),
      gtk_rc_property_parse_enum);
 

-  custom_entry_signals[CLICKED] = 
+  custom_entry_signals[CLICKED] =

     g_signal_new ("clicked",
     g_signal_new ("clicked",

-                 G_TYPE_FROM_CLASS(gobject_class),
+                 G_TYPE_FROM_CLASS (gobject_class),

                  G_SIGNAL_RUN_LAST,
                  0,
                  NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_SIGNAL_RUN_LAST,
                  0,
                  NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,

-                 G_TYPE_NONE, 
+                 G_TYPE_NONE,

                  0);
 
 
                  0);
 
 


@@ -400,11 +403,11 @@ psppire_custom_entry_size_allocate (GtkWidget     *widget,
   g_return_if_fail (allocation != NULL);
 
   ce = PSPPIRE_CUSTOM_ENTRY (widget);
   g_return_if_fail (allocation != NULL);
 
   ce = PSPPIRE_CUSTOM_ENTRY (widget);

-  button_width = psppire_custom_entry_get_button_width(ce);
+  button_width = psppire_custom_entry_get_button_width (ce);

   panel_width = button_width + 2 * widget->style->xthickness;
   panel_width = button_width + 2 * widget->style->xthickness;

-  
+

   widget->allocation = *allocation;
   widget->allocation = *allocation;

-  
+

   entry_allocation = *allocation;
   entry_allocation.width -= panel_width;
 
   entry_allocation = *allocation;
   entry_allocation.width -= panel_width;
 


@@ -428,11 +431,11 @@ psppire_custom_entry_size_allocate (GtkWidget     *widget,
 
   if (GTK_WIDGET_REALIZED (widget))
     {
 
   if (GTK_WIDGET_REALIZED (widget))
     {

-      gdk_window_move_resize (PSPPIRE_CUSTOM_ENTRY (widget)->panel, 
+      gdk_window_move_resize (PSPPIRE_CUSTOM_ENTRY (widget)->panel,

                              panel_allocation.x,
                              panel_allocation.y,
                              panel_allocation.width,
                              panel_allocation.x,
                              panel_allocation.y,
                              panel_allocation.width,

-                             panel_allocation.height); 
+                             panel_allocation.height);

     }
 
   psppire_custom_entry_redraw (ce);
     }
 
   psppire_custom_entry_redraw (ce);