diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/glade-utils.c | 26 | ||||
-rw-r--r-- | src/glade-utils.h | 13 | ||||
-rw-r--r-- | src/glade-widget.c | 5 |
3 files changed, 3 insertions, 41 deletions
diff --git a/src/glade-utils.c b/src/glade-utils.c index b4e6e1ff..ce858eb1 100644 --- a/src/glade-utils.c +++ b/src/glade-utils.c @@ -288,31 +288,6 @@ glade_util_hide_window (GtkWindow *window) gtk_window_move(window, x, y); } -gint -glade_util_check_key_is_esc (GtkWidget *widget, - GdkEventKey *event, - gpointer data) -{ - g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE); - - if (event->keyval == GDK_Escape) { - GladeEscAction action = GPOINTER_TO_INT (data); - - if (action == GladeEscCloses) { - glade_util_hide_window (GTK_WINDOW (widget)); - return TRUE; - } - else if (action == GladeEscDestroys) { - gtk_widget_destroy (widget); - return TRUE; - } - else - return FALSE; - } - else - return FALSE; -} - /** * glade_util_file_selection_new: * @title: dialog title @@ -357,7 +332,6 @@ glade_util_replace (char *str, char a, char b) } } - /** * duplicates the string passed as argument, but changing each underscore * in the original string by two underscores. Returns a newly allocated diff --git a/src/glade-utils.h b/src/glade-utils.h index 504418b2..a7fc7bf6 100644 --- a/src/glade-utils.h +++ b/src/glade-utils.h @@ -5,18 +5,8 @@ G_BEGIN_DECLS -/* Function is a GNU extension */ -#ifndef __GNUC__ -#define __FUNCTION__ "" -#endif +#define glade_implement_me() g_print ("Implement me : %s %d %s\n", __FILE__, __LINE__, G_GNUC_FUNCTION); -#define glade_implement_me() g_print ("Implement me : %s %d %s\n", __FILE__, __LINE__, __FUNCTION__); - -typedef enum -{ - GladeEscCloses, - GladeEscDestroys -} GladeEscAction; void glade_util_widget_set_tooltip (GtkWidget *widget, const gchar *str); GType glade_util_get_type_from_name (const gchar *name); @@ -30,7 +20,6 @@ void glade_util_flash_message (GtkWidget *statusbar, gint glade_util_compare_stock_labels (gconstpointer a, gconstpointer b); void glade_util_hide_window (GtkWindow *window); -gint glade_util_check_key_is_esc (GtkWidget *widget, GdkEventKey *event, gpointer data); gchar *glade_util_gtk_combo_func (gpointer data); gpointer glade_util_gtk_combo_find (GtkCombo *combo); diff --git a/src/glade-widget.c b/src/glade-widget.c index 98083608..df6402f4 100644 --- a/src/glade-widget.c +++ b/src/glade-widget.c @@ -32,7 +32,6 @@ #include "glade-property.h" #include "glade-property-class.h" #include "glade-popup.h" -#include "glade-placeholder.h" #include "glade-signal.h" #include "glade-clipboard.h" #include "glade-command.h" @@ -76,7 +75,7 @@ glade_widget_properties_from_list (GList *list, GladeWidget *widget) } new_list = g_list_reverse (new_list); - + return new_list; } @@ -411,7 +410,7 @@ glade_widget_connect_mouse_signals (GladeWidget *glade_widget) | GDK_BUTTON_RELEASE_MASK); } } - + g_signal_connect (G_OBJECT (widget), "button_press_event", G_CALLBACK (glade_widget_button_press), NULL); g_signal_connect (G_OBJECT (widget), "button_release_event", |