From a5b70aa2f9f1752747ece5ffc4d199dedef1d6e6 Mon Sep 17 00:00:00 2001 From: John Luke Date: Sun, 11 Jan 2004 02:58:08 +0000 Subject: [PATCH] 2004-01-10 John Luke * samples/GtkDemo/*.cs: make it compile patch from Yves Kurz svn path=/trunk/gtk-sharp/; revision=21925 --- ChangeLog | 5 +++++ sample/GtkDemo/DemoDialog.cs | 8 ++++---- sample/GtkDemo/DemoMain.cs | 4 ++-- sample/GtkDemo/DemoMenus.cs | 14 ++++++++++---- sample/GtkDemo/DemoSizeGroup.cs | 2 +- sample/GtkDemo/Makefile | 2 +- sample/GtkDemo/README | 2 +- 7 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 817fff47e..923113277 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-01-10 John Luke + + * samples/GtkDemo/*.cs: make it compile + patch from Yves Kurz + 2004-01-09 Mike Kestner * gtk/Gtk.metadata : hide NotebookPage.Num method diff --git a/sample/GtkDemo/DemoDialog.cs b/sample/GtkDemo/DemoDialog.cs index c74c92a24..7c397152c 100644 --- a/sample/GtkDemo/DemoDialog.cs +++ b/sample/GtkDemo/DemoDialog.cs @@ -65,13 +65,13 @@ namespace GtkDemo table.ColumnSpacing = 4; hbox.PackStart (table); - Label label = Label.NewWithMnemonic ("_Entry1"); + Label label = new Label ("_Entry1"); table.Attach (label, 0, 1, 0, 1); entry1 = new Entry (); table.Attach (entry1, 1, 2, 0, 1); label.MnemonicWidget = entry1; - label = Label.NewWithMnemonic ("E_ntry2"); + label = new Label ("E_ntry2"); table.Attach (label,0,1,1,2); entry2 = new Entry (); table.Attach (entry2, 1, 2, 1, 2); @@ -119,14 +119,14 @@ namespace GtkDemo table.ColumnSpacing = 4; hbox.PackStart (table, false, false, 0); - Label label = Label.NewWithMnemonic ("_Entry1"); + Label label = new Label ("_Entry1"); table.Attach (label, 0, 1, 0, 1); Entry localEntry1 = new Entry(); localEntry1.Text = entry1.Text; table.Attach (localEntry1, 1, 2, 0, 1); label.MnemonicWidget = localEntry1; - label = Label.NewWithMnemonic ("E_ntry2"); + label = new Label ("E_ntry2"); table.Attach (label, 0, 1, 1, 2); Entry localEntry2 = new Entry(); localEntry2.Text = entry2.Text; diff --git a/sample/GtkDemo/DemoMain.cs b/sample/GtkDemo/DemoMain.cs index b97744d5c..e382c7991 100644 --- a/sample/GtkDemo/DemoMain.cs +++ b/sample/GtkDemo/DemoMain.cs @@ -50,8 +50,8 @@ namespace GtkDemo Notebook notebook = new Notebook (); hbox.PackStart (notebook, true, true, 0); - notebook.AppendPage (CreateText (infoBuffer, false), Label.NewWithMnemonic ("_Info")); - notebook.AppendPage (CreateText (sourceBuffer, true), Label.NewWithMnemonic ("_Source")); + notebook.AppendPage (CreateText (infoBuffer, false), new Label ("_Info")); + notebook.AppendPage (CreateText (sourceBuffer, true), new Label ("_Source")); window.ShowAll (); } diff --git a/sample/GtkDemo/DemoMenus.cs b/sample/GtkDemo/DemoMenus.cs index 0b241389f..3a1f0ea09 100644 --- a/sample/GtkDemo/DemoMenus.cs +++ b/sample/GtkDemo/DemoMenus.cs @@ -94,16 +94,22 @@ namespace GtkDemo menuitem = new CheckMenuItem ("Accelerate Me"); menu.Append (menuitem); - menuitem.AddAccelerator ("activate", accel_group, 0xFFBE, 0, AccelFlags.Visible); + AccelKey ak = new AccelKey (); + ak.accel_key = 0xFFBE; + menuitem.AddAccelerator ("activate", accel_group, ak, 0, AccelFlags.Visible); menuitem = new CheckMenuItem ("Accelerator locked"); menu.Append (menuitem); - menuitem.AddAccelerator ("activate", accel_group, 0xFFBF, 0, AccelFlags.Visible | AccelFlags.Locked); + AccelKey ak2 = new AccelKey (); + ak2.accel_key = 0xFFBF; + menuitem.AddAccelerator ("activate", accel_group, ak2, 0, AccelFlags.Visible | AccelFlags.Locked); menuitem = new CheckMenuItem ("Accelerator Frozen"); menu.Append (menuitem); - menuitem.AddAccelerator ("activate", accel_group, 0xFFBF, 0, AccelFlags.Visible); - menuitem.AddAccelerator ("activate", accel_group, 0xFFC0, 0, AccelFlags.Visible); + AccelKey ak3 = new AccelKey (); + ak3.accel_key = 0xFFC0; + menuitem.AddAccelerator ("activate", accel_group, ak2, 0, AccelFlags.Visible); + menuitem.AddAccelerator ("activate", accel_group, ak3, 0, AccelFlags.Visible); OptionMenu option_menu = new OptionMenu (); option_menu.Menu = menu; diff --git a/sample/GtkDemo/DemoSizeGroup.cs b/sample/GtkDemo/DemoSizeGroup.cs index c349ed648..b616552b0 100644 --- a/sample/GtkDemo/DemoSizeGroup.cs +++ b/sample/GtkDemo/DemoSizeGroup.cs @@ -109,7 +109,7 @@ namespace GtkDemo private void AddRow (Table table, uint row, SizeGroup sizeGroup, string labelText, string [] options) { - Label label = Label.NewWithMnemonic (labelText); + Label label = new Label (labelText); label.SetAlignment (0, 1); table.Attach (label, diff --git a/sample/GtkDemo/Makefile b/sample/GtkDemo/Makefile index ac5abd3a5..b919958d9 100644 --- a/sample/GtkDemo/Makefile +++ b/sample/GtkDemo/Makefile @@ -3,7 +3,7 @@ CSC = mcs DLLS = /r:gtk-sharp.dll /r:glib-sharp.dll /r:pango-sharp.dll /r:gdk-sharp.dll /r:System.Drawing.dll -all: +all: *.cs $(CSC) -g /out:GtkDemo.exe *.cs $(DLLS) clean: diff --git a/sample/GtkDemo/README b/sample/GtkDemo/README index b3f0e128f..cf789c847 100644 --- a/sample/GtkDemo/README +++ b/sample/GtkDemo/README @@ -1,4 +1,4 @@ -This port of gtk-demo.c is still INCOMPLETE. If you can't contribute to it +This port of gtk-demo.c is still INCOMPLETE. If you can contribute to it don't hesistate to mail your patches at the gtk-sharp-list@lists.ximian.com