callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port testtreeview to new API

Browse Source 
Use GtkComboBox instead the deprecated GtkOptionMenu

https://bugzilla.gnome.org/show_bug.cgi?id=616679
This commit is contained in:
Javier Jardón 2010-04-24 03:53:11 +02:00
parent 623966b6da
commit 2c2726f818
1 changed files with 17 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
tests/testtreeview.c
View File

@ -18,7 +18,6 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#undef GTK_DISABLE_DEPRECATED
#include <string.h> #include <string.h>
#include "prop-editor.h" #include "prop-editor.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -658,12 +657,12 @@ create_tree_model (void)
} }
static void static void
model_selected (GtkOptionMenu *om, gpointer data) model_selected (GtkComboBox *combo_box, gpointer data)
{ {
GtkTreeView *tree_view = GTK_TREE_VIEW (data); GtkTreeView *tree_view = GTK_TREE_VIEW (data);
gint hist; gint hist;
hist = gtk_option_menu_get_history (om); hist = gtk_combo_box_get_active (combo_box);
if (models[hist] != gtk_tree_view_get_model (tree_view)) if (models[hist] != gtk_tree_view_get_model (tree_view))
{ {
@ -672,12 +671,12 @@ model_selected (GtkOptionMenu *om, gpointer data)
} }
static void static void
columns_selected (GtkOptionMenu *om, gpointer data) columns_selected (GtkComboBox *combo_box, gpointer data)
{ {
GtkTreeView *tree_view = GTK_TREE_VIEW (data); GtkTreeView *tree_view = GTK_TREE_VIEW (data);
gint hist; gint hist;
hist = gtk_option_menu_get_history (om); hist = gtk_combo_box_get_active (combo_box);
if (hist != get_columns_type ()) if (hist != get_columns_type ())
{ {
@ -704,8 +703,7 @@ main (int argc,
GtkWidget *sw; GtkWidget *sw;
GtkWidget *tv; GtkWidget *tv;
GtkWidget *table; GtkWidget *table;
GtkWidget *om; GtkWidget *combo_box;
GtkWidget *menu;
GtkTreeModel *model; GtkTreeModel *model;
gint i; gint i;
@ -756,77 +754,34 @@ main (int argc,
GDK_ACTION_MOVE | GDK_ACTION_COPY); GDK_ACTION_MOVE | GDK_ACTION_COPY);
/* Model menu */ /* Model menu */
combo_box = gtk_combo_box_new_text ();
menu = gtk_menu_new (); for (i = 0; i < MODEL_LAST; i++)
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), model_names[i]);
i = 0; gtk_table_attach (GTK_TABLE (table), combo_box,
while (i < MODEL_LAST)
{
GtkWidget *mi;
const char *name;
name = model_names[i];
mi = gtk_menu_item_new_with_label (name);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
#if 0
window = create_prop_editor (G_OBJECT (models[i]));
gtk_window_set_title (GTK_WINDOW (window),
name);
#endif
++i;
}
gtk_widget_show_all (menu);
om = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (om), menu);
gtk_table_attach (GTK_TABLE (table), om,
0, 1, 0, 1, 0, 1, 0, 1,
0, 0, 0, 0,
0, 0); 0, 0);
g_signal_connect (om, g_signal_connect (combo_box,
"changed", "changed",
G_CALLBACK (model_selected), G_CALLBACK (model_selected),
tv); tv);
/* Columns menu */ /* Columns menu */
combo_box = gtk_combo_box_new_text ();
menu = gtk_menu_new (); for (i = 0; i < COLUMNS_LAST; i++)
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), column_type_names[i]);
i = 0; gtk_table_attach (GTK_TABLE (table), combo_box,
while (i < COLUMNS_LAST)
{
GtkWidget *mi;
const char *name;
name = column_type_names[i];
mi = gtk_menu_item_new_with_label (name);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
++i;
}
gtk_widget_show_all (menu);
om = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (om), menu);
gtk_table_attach (GTK_TABLE (table), om,
0, 1, 1, 2, 0, 1, 1, 2,
0, 0, 0, 0,
0, 0); 0, 0);
set_columns_type (GTK_TREE_VIEW (tv), COLUMNS_LOTS); set_columns_type (GTK_TREE_VIEW (tv), COLUMNS_LOTS);
gtk_option_menu_set_history (GTK_OPTION_MENU (om), COLUMNS_LOTS); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), COLUMNS_LOTS);
g_signal_connect (om, g_signal_connect (combo_box,
"changed", "changed",
G_CALLBACK (columns_selected), G_CALLBACK (columns_selected),
tv); tv);