projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible memory corruption when creating dialogs with selectors.
[pspp]
/
src
/
ui
/
gui
/
customentry.c
diff --git
a/src/ui/gui/customentry.c
b/src/ui/gui/customentry.c
index 7b3104693589d95d28aa03745d8811baa9b8e176..dc5848ec087b86e338d8c7b25b2487425c15e2ea 100644
(file)
--- a/
src/ui/gui/customentry.c
+++ b/
src/ui/gui/customentry.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2005, 2007 Free Software Foundation
+ Copyright (C) 2005, 2007
, 2010, 2011, 2012
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
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
@@
-55,10
+55,9
@@
#include <config.h>
#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
#include "customentry.h"
#include "customentry.h"
-
+#include "helper.h"
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);
@@
-107,7
+106,7
@@
psppire_custom_entry_get_type (void)
static void
psppire_custom_entry_map (GtkWidget *widget)
{
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);
{
GTK_WIDGET_CLASS (parent_class)->map (widget);
gdk_window_show (PSPPIRE_CUSTOM_ENTRY (widget)->panel);
@@
-117,7
+116,7
@@
psppire_custom_entry_map (GtkWidget *widget)
static void
psppire_custom_entry_unmap (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);
{
gdk_window_hide (PSPPIRE_CUSTOM_ENTRY (widget)->panel);
GTK_WIDGET_CLASS (parent_class)->unmap (widget);
@@
-233,7
+232,7
@@
psppire_custom_entry_redraw (PsppireCustomEntry *custom_entry)
widget = GTK_WIDGET (custom_entry);
widget = GTK_WIDGET (custom_entry);
- if (
GTK_WIDGET_DRAWABLE
(widget))
+ if (
gtk_widget_is_drawable
(widget))
{
gtk_widget_queue_draw (widget);
{
gtk_widget_queue_draw (widget);
@@
-254,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);
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;
{
gboolean is_editable;
GtkShadowType shadow_type;
@@
-305,12
+304,10
@@
psppire_custom_entry_class_init (PsppireCustomEntryClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class;
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class;
- GtkEntryClass *entry_class;
parent_class = g_type_class_peek_parent (klass);
widget_class = (GtkWidgetClass*) klass;
parent_class = g_type_class_peek_parent (klass);
widget_class = (GtkWidgetClass*) klass;
- entry_class = (GtkEntryClass*) klass;
widget_class->map = psppire_custom_entry_map;
widget_class->unmap = psppire_custom_entry_unmap;
widget_class->map = psppire_custom_entry_map;
widget_class->unmap = psppire_custom_entry_unmap;
@@
-369,7
+366,7
@@
psppire_custom_entry_button_press (GtkWidget *widget,
if (event->window == ce->panel)
{
gboolean is_editable ;
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);
gtk_widget_grab_focus (widget);
g_object_get (ce, "editable", &is_editable, NULL);
@@
-426,7
+423,7
@@
psppire_custom_entry_size_allocate (GtkWidget *widget,
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, &entry_allocation);
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,
{
gdk_window_move_resize (PSPPIRE_CUSTOM_ENTRY (widget)->panel,
panel_allocation.x,