diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-08-24 22:06:52 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-08-24 22:06:52 +0000 |
| commit | 32c6a944cfc5db7f59ee6232a8d76c04a27e908e (patch) | |
| tree | 21bb0cd230bd2d06d4751bc5db10719909eb20bb /tests | |
| parent | b374ae3fb4ff4a92a5ba0cb3f50a1ba9073875e1 (diff) | |
| download | gtk+-32c6a944cfc5db7f59ee6232a8d76c04a27e908e.tar.gz | |
Namespace the enum values properly. Sorry about the resize grip trouble,
2003-08-25 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h (GtkActionGroupEntryType): Namespace the enum
values properly. Sorry about the resize grip trouble, Owen. (#120621)
* gtk/gtkactiongroup.c:
* demos/gtk-demo/appwindow.c:
* tests/testmerge.c:
* tests/testactions.c: Use new GtkActionGroupEntryType enum.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testactions.c | 20 | ||||
| -rw-r--r-- | tests/testmerge.c | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tests/testactions.c b/tests/testactions.c index b5e1f6c7d1..d2d1be33a1 100644 --- a/tests/testactions.c +++ b/tests/testactions.c @@ -94,41 +94,41 @@ static GtkActionGroupEntry entries[] = { G_CALLBACK (activate_action), NULL }, { "bold", N_("_Bold"), GTK_STOCK_BOLD, "<control>B", N_("Change to bold face"), - G_CALLBACK (toggle_action), NULL, TOGGLE_ACTION }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_TOGGLE }, { "justify-left", N_("_Left"), GTK_STOCK_JUSTIFY_LEFT, "<control>L", N_("Left justify the text"), - G_CALLBACK (toggle_action), NULL, RADIO_ACTION }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO }, { "justify-center", N_("C_enter"), GTK_STOCK_JUSTIFY_CENTER, "<control>E", N_("Center justify the text"), - G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" }, { "justify-right", N_("_Right"), GTK_STOCK_JUSTIFY_RIGHT, "<control>R", N_("Right justify the text"), - G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" }, { "justify-fill", N_("_Fill"), GTK_STOCK_JUSTIFY_FILL, "<control>J", N_("Fill justify the text"), - G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" }, { "quit", NULL, GTK_STOCK_QUIT, "<control>Q", N_("Quit the application"), G_CALLBACK (gtk_main_quit), NULL }, { "toggle-cnp", N_("Enable Cut/Copy/Paste"), NULL, NULL, N_("Change the sensitivity of the cut, copy and paste actions"), - G_CALLBACK (toggle_cnp_actions), NULL, TOGGLE_ACTION }, + G_CALLBACK (toggle_cnp_actions), NULL, GTK_ACTION_TOGGLE }, { "customise-accels", N_("Customise _Accels"), NULL, NULL, N_("Customise keyboard shortcuts"), G_CALLBACK (show_accel_dialog), NULL }, { "toolbar-icons", N_("Icons"), NULL, NULL, NULL, G_CALLBACK (toolbar_style), GINT_TO_POINTER (GTK_TOOLBAR_ICONS), - RADIO_ACTION, NULL }, + GTK_ACTION_RADIO, NULL }, { "toolbar-text", N_("Text"), NULL, NULL, NULL, G_CALLBACK (toolbar_style), GINT_TO_POINTER (GTK_TOOLBAR_TEXT), - RADIO_ACTION, "toolbar-icons" }, + GTK_ACTION_RADIO, "toolbar-icons" }, { "toolbar-both", N_("Both"), NULL, NULL, NULL, G_CALLBACK (toolbar_style), GINT_TO_POINTER (GTK_TOOLBAR_BOTH), - RADIO_ACTION, "toolbar-icons" }, + GTK_ACTION_RADIO, "toolbar-icons" }, { "toolbar-both-horiz", N_("Both Horizontal"), NULL, NULL, NULL, G_CALLBACK (toolbar_style), GINT_TO_POINTER(GTK_TOOLBAR_BOTH_HORIZ), - RADIO_ACTION, "toolbar-icons" }, + GTK_ACTION_RADIO, "toolbar-icons" }, { "toolbar-small-icons", N_("Small Icons"), NULL, NULL, NULL, G_CALLBACK (toolbar_size), GINT_TO_POINTER (GTK_ICON_SIZE_SMALL_TOOLBAR) }, diff --git a/tests/testmerge.c b/tests/testmerge.c index 8e501af7a3..a352f3866a 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -66,16 +66,16 @@ static GtkActionGroupEntry entries[] = { G_CALLBACK (activate_action), NULL }, { "justify-left", NULL, GTK_STOCK_JUSTIFY_LEFT, "<control>L", N_("Left justify the text"), - G_CALLBACK (toggle_action), NULL, RADIO_ACTION, NULL }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, NULL }, { "justify-center", NULL, GTK_STOCK_JUSTIFY_CENTER, "<control>E", N_("Center justify the text"), - G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" }, { "justify-right", NULL, GTK_STOCK_JUSTIFY_RIGHT, "<control>R", N_("Right justify the text"), - G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" }, { "justify-fill", NULL, GTK_STOCK_JUSTIFY_FILL, "<control>J", N_("Fill justify the text"), - G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" }, + G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" }, { "AboutAction", N_("_About"), NULL, NULL, NULL, G_CALLBACK (activate_action), NULL }, }; |