diff options
| author | Vincent Geddes <vgeddes@src.gnome.org> | 2007-06-28 13:04:27 +0000 |
|---|---|---|
| committer | Vincent Geddes <vgeddes@src.gnome.org> | 2007-06-28 13:04:27 +0000 |
| commit | 38e82ea996bfd32b6f9664c67d6c644291983551 (patch) | |
| tree | 5429da871435f944021427ee5912a652e7f76e56 | |
| parent | 507b974afcb50cee671e287d47ab03afe9efc588 (diff) | |
| download | glade-38e82ea996bfd32b6f9664c67d6c644291983551.tar.gz | |
Move GladeItemAppearance enum from glade-palette-item.h to glade-palette.h
* gladeui/glade-palette.h, gladeui/glade-palette-item.h: Move GladeItemAppearance
enum from glade-palette-item.h to glade-palette.h (so it is visible in the docs).
* src/glade-project-window.c (check_reload_project): Set alternatibe button order
on message dialog.
svn path=/trunk/; revision=1408
| -rw-r--r-- | gladeui/glade-palette-box.h | 1 | ||||
| -rw-r--r-- | gladeui/glade-palette-expander.h | 2 | ||||
| -rw-r--r-- | gladeui/glade-palette-item.h | 8 | ||||
| -rw-r--r-- | gladeui/glade-palette.h | 8 | ||||
| -rw-r--r-- | src/glade-project-window.c | 5 |
5 files changed, 12 insertions, 12 deletions
diff --git a/gladeui/glade-palette-box.h b/gladeui/glade-palette-box.h index eeb35196..687a4cdc 100644 --- a/gladeui/glade-palette-box.h +++ b/gladeui/glade-palette-box.h @@ -43,7 +43,6 @@ typedef struct _GladePaletteBoxClass GladePaletteBoxClass; struct _GladePaletteBox { - /*< private >*/ GtkContainer parent_instance; GladePaletteBoxPrivate *priv; diff --git a/gladeui/glade-palette-expander.h b/gladeui/glade-palette-expander.h index 6f43e881..f080b4c7 100644 --- a/gladeui/glade-palette-expander.h +++ b/gladeui/glade-palette-expander.h @@ -41,7 +41,6 @@ typedef struct _GladePaletteExpanderClass GladePaletteExpanderClass; struct _GladePaletteExpander { - /*< private >*/ GtkBin parent_instance; GladePaletteExpanderPrivate *priv; @@ -83,4 +82,3 @@ gboolean glade_palette_expander_get_use_markup (GladePaletteExpander *exp G_END_DECLS #endif /* __GLADE_PALETTE_EXPANDER_H__ */ - diff --git a/gladeui/glade-palette-item.h b/gladeui/glade-palette-item.h index ac7f49a4..daa87fbe 100644 --- a/gladeui/glade-palette-item.h +++ b/gladeui/glade-palette-item.h @@ -47,14 +47,6 @@ typedef struct _GladePaletteItem GladePaletteItem; typedef struct _GladePaletteItemPrivate GladePaletteItemPrivate; typedef struct _GladePaletteItemClass GladePaletteItemClass; -typedef enum _GladeItemAppearance { - - GLADE_ITEM_ICON_AND_LABEL, - GLADE_ITEM_ICON_ONLY, - GLADE_ITEM_LABEL_ONLY - -} GladeItemAppearance; - struct _GladePaletteItem { GtkToggleButton parent_instance; diff --git a/gladeui/glade-palette.h b/gladeui/glade-palette.h index 55e5d08d..d1d8a63a 100644 --- a/gladeui/glade-palette.h +++ b/gladeui/glade-palette.h @@ -30,7 +30,6 @@ #define __GLADE_PALETTE_H__ #include <gladeui/glade.h> -#include <gladeui/glade-palette-item.h> #include <gtk/gtkvbox.h> @@ -61,6 +60,13 @@ struct _GladePaletteClass void (*toggled) (GladePalette *palette); }; +typedef enum _GladeItemAppearance +{ + GLADE_ITEM_ICON_AND_LABEL, + GLADE_ITEM_ICON_ONLY, + GLADE_ITEM_LABEL_ONLY +} GladeItemAppearance; + GType glade_palette_get_type (void) G_GNUC_CONST; diff --git a/src/glade-project-window.c b/src/glade-project-window.c index 62f4f824..e0e87333 100644 --- a/src/glade-project-window.c +++ b/src/glade-project-window.c @@ -2696,6 +2696,11 @@ check_reload_project (GladeProjectWindow *gpw, GladeProject *project) gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_ACCEPT); + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_REJECT, + -1); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT); |