X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcustomentry.c;h=b7d0ce2d27c25eef7d4874e1ef5a178b240fadb3;hb=37d5f592081a2ec8fa461c20c84087e8bf5dc560;hp=b40c11cd0301588c14309485e348a86723e19764;hpb=948629d16bb369cdda1f3b8f24d5440fc5976651;p=pspp

diff --git a/src/ui/gui/customentry.c b/src/ui/gui/customentry.c
index b40c11cd03..b7d0ce2d27 100644
--- a/src/ui/gui/customentry.c
+++ b/src/ui/gui/customentry.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2005, 2007  Free Software Foundation
+   Copyright (C) 2005, 2007, 2010, 2011  Free Software Foundation
 
    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
@@ -54,14 +54,10 @@
  */
 
 #include <config.h>
-#include <gettext.h>
-#define _(msgid) gettext (msgid)
 
-
-#include <gtk/gtksignal.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 #include "customentry.h"
-
+#include "helper.h"
 
 static void psppire_custom_entry_class_init          (PsppireCustomEntryClass *klass);
 static void psppire_custom_entry_init                (PsppireCustomEntry      *ce);
@@ -110,7 +106,7 @@ psppire_custom_entry_get_type (void)
 static void
 psppire_custom_entry_map (GtkWidget *widget)
 {
-  if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget))
+  if (gtk_widget_get_realized (widget) && !gtk_widget_get_mapped (widget))
     {
       GTK_WIDGET_CLASS (parent_class)->map (widget);
       gdk_window_show (PSPPIRE_CUSTOM_ENTRY (widget)->panel);
@@ -120,7 +116,7 @@ psppire_custom_entry_map (GtkWidget *widget)
 static void
 psppire_custom_entry_unmap (GtkWidget *widget)
 {
-  if (GTK_WIDGET_MAPPED (widget))
+  if (gtk_widget_get_mapped (widget))
     {
       gdk_window_hide (PSPPIRE_CUSTOM_ENTRY (widget)->panel);
       GTK_WIDGET_CLASS (parent_class)->unmap (widget);
@@ -236,7 +232,7 @@ psppire_custom_entry_redraw (PsppireCustomEntry *custom_entry)
 
   widget = GTK_WIDGET (custom_entry);
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       gtk_widget_queue_draw (widget);
 
@@ -257,7 +253,7 @@ psppire_custom_entry_expose (GtkWidget      *widget,
   g_return_val_if_fail (PSPPIRE_IS_CUSTOM_ENTRY (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       gboolean is_editable;
       GtkShadowType shadow_type;
@@ -331,7 +327,7 @@ psppire_custom_entry_class_init (PsppireCustomEntryClass *klass)
     (widget_class,
      g_param_spec_enum ("shadow_type",
 			"Shadow Type",
-			_("Style of bevel around the custom entry button"),
+			"Style of bevel around the custom entry button",
 			GTK_TYPE_SHADOW_TYPE,
 			GTK_SHADOW_ETCHED_IN,
 			G_PARAM_READABLE),
@@ -372,7 +368,7 @@ psppire_custom_entry_button_press (GtkWidget *widget,
   if (event->window == ce->panel)
     {
       gboolean is_editable ;
-      if (!GTK_WIDGET_HAS_FOCUS (widget))
+      if (!gtk_widget_has_focus (widget))
 	gtk_widget_grab_focus (widget);
 
       g_object_get (ce, "editable", &is_editable, NULL);
@@ -429,7 +425,7 @@ psppire_custom_entry_size_allocate (GtkWidget     *widget,
 
   GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, &entry_allocation);
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     {
       gdk_window_move_resize (PSPPIRE_CUSTOM_ENTRY (widget)->panel,
 			      panel_allocation.x,