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

enable GTK_DISABLE_DEPRECATED again, (set_interp_type), (main): port over

Browse Source 
Mon Oct 13 20:21:55 2003  Kristian Rietveld  <kris@gtk.org>

	* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
	(set_interp_type), (main): port over from option menu to GtkComboBox.
This commit is contained in:
Kristian Rietveld
2003-10-13 18:15:10 +00:00
committed by Kristian Rietveld
parent d4627e1da4
commit 9607ba378a
6 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
(set_interp_type), (main): port over from option menu to GtkComboBox.
Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org> Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org>
* tests/testmenus.c: Still uses option menus, so turn off * tests/testmenus.c: Still uses option menus, so turn off

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
(set_interp_type), (main): port over from option menu to GtkComboBox.
Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org> Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org>
* tests/testmenus.c: Still uses option menus, so turn off * tests/testmenus.c: Still uses option menus, so turn off

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
(set_interp_type), (main): port over from option menu to GtkComboBox.
Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org> Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org>
* tests/testmenus.c: Still uses option menus, so turn off * tests/testmenus.c: Still uses option menus, so turn off

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
(set_interp_type), (main): port over from option menu to GtkComboBox.
Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org> Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org>
* tests/testmenus.c: Still uses option menus, so turn off * tests/testmenus.c: Still uses option menus, so turn off

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
(set_interp_type), (main): port over from option menu to GtkComboBox.
Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org> Mon Oct 13 19:41:55 2003 Kristian Rietveld <kris@gtk.org>
* tests/testmenus.c: Still uses option menus, so turn off * tests/testmenus.c: Still uses option menus, so turn off

51
demos/testpixbuf-scale.c
View File

@ -1,4 +1,3 @@
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <stdio.h> #include <stdio.h>
@ -12,7 +11,12 @@ GtkWidget *darea;
void void
set_interp_type (GtkWidget *widget, gpointer data) set_interp_type (GtkWidget *widget, gpointer data)
{ {
interp_type = GPOINTER_TO_UINT (data); guint types[] = { GDK_INTERP_NEAREST,
GDK_INTERP_BILINEAR,
GDK_INTERP_TILES,
GDK_INTERP_HYPER };
interp_type = types[gtk_combo_box_get_active (GTK_COMBO_BOX (widget))];
gtk_widget_queue_draw (darea); gtk_widget_queue_draw (darea);
} }
@ -59,7 +63,7 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
GtkWidget *window, *vbox; GtkWidget *window, *vbox;
GtkWidget *menuitem, *optionmenu, *menu; GtkWidget *combo_box;
GtkWidget *alignment; GtkWidget *alignment;
GtkWidget *hbox, *label, *hscale; GtkWidget *hbox, *label, *hscale;
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
@ -96,37 +100,18 @@ main(int argc, char **argv)
vbox = gtk_vbox_new (FALSE, 0); vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), vbox); gtk_container_add (GTK_CONTAINER (window), vbox);
menu = gtk_menu_new (); combo_box = gtk_combo_box_new_text ();
menuitem = gtk_menu_item_new_with_label ("NEAREST"); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "NEAREST");
g_signal_connect (menuitem, "activate", gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "BILINEAR");
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "TILES");
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "HYPER");
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1);
g_signal_connect (combo_box, "changed",
G_CALLBACK (set_interp_type), G_CALLBACK (set_interp_type),
GUINT_TO_POINTER (GDK_INTERP_NEAREST)); NULL);
gtk_widget_show (menuitem);
gtk_container_add (GTK_CONTAINER (menu), menuitem);
menuitem = gtk_menu_item_new_with_label ("BILINEAR");
g_signal_connect (menuitem, "activate",
G_CALLBACK (set_interp_type),
GUINT_TO_POINTER (GDK_INTERP_BILINEAR));
gtk_widget_show (menuitem);
gtk_container_add (GTK_CONTAINER (menu), menuitem);
menuitem = gtk_menu_item_new_with_label ("TILES");
g_signal_connect (menuitem, "activate",
G_CALLBACK (set_interp_type),
GUINT_TO_POINTER (GDK_INTERP_TILES));
gtk_container_add (GTK_CONTAINER (menu), menuitem);
menuitem = gtk_menu_item_new_with_label ("HYPER");
g_signal_connect (menuitem, "activate",
G_CALLBACK (set_interp_type),
GUINT_TO_POINTER (GDK_INTERP_HYPER));
gtk_container_add (GTK_CONTAINER (menu), menuitem);
optionmenu = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 1);
alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5); alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
@ -145,7 +130,7 @@ main(int argc, char **argv)
gtk_scale_set_digits (GTK_SCALE (hscale), 0); gtk_scale_set_digits (GTK_SCALE (hscale), 0);
gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (alignment), optionmenu); gtk_container_add (GTK_CONTAINER (alignment), combo_box);
gtk_widget_show_all (vbox); gtk_widget_show_all (vbox);
/* Compute the size without the drawing area, so we know how big to make the default size */ /* Compute the size without the drawing area, so we know how big to make the default size */