diff --git a/ChangeLog b/ChangeLog index f4d5b2c62..6b561bbf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-06-26 Rachel Hestilow + + * parser/Gtk.metadata: Change gtk_label_new to be the + preferred constructor. + + * gdk/Event.cs: Add "IsValid" property (sometimes NULL events + get sent in signals). + + * sample/GnomeHelloWorld.cs: Check to make sure iconlist event + is valid. + 2002-06-26 Rachel Hestilow * configure.in, makefile, makefile.win32: add gnome. diff --git a/gdk/Event.cs b/gdk/Event.cs index 60d042ebd..e4c58873e 100644 --- a/gdk/Event.cs +++ b/gdk/Event.cs @@ -23,6 +23,12 @@ namespace Gdk { return gtksharp_gdk_event_get_event_type (Handle); } } + + public bool IsValid { + get { + return (Handle != IntPtr.Zero); + } + } } } diff --git a/gdk/Makefile.in b/gdk/Makefile.in index d42ce4863..ab44aeeaf 100755 --- a/gdk/Makefile.in +++ b/gdk/Makefile.in @@ -7,7 +7,7 @@ windows: linux: gdk-sharp.dll -gdk-sharp.dll: generated/*.cs +gdk-sharp.dll: *.cs generated/*.cs $(MCS) --unsafe --target library -L ../glib -L ../pango -L ../atk -r glib-sharp -r pango-sharp -r atk-sharp -o gdk-sharp.dll --recurse '*.cs' clean: diff --git a/generator/gtkapi.xml b/generator/gtkapi.xml index c0fd9df18..c7b0a9562 100644 --- a/generator/gtkapi.xml +++ b/generator/gtkapi.xml @@ -1,2 +1,2 @@ - + diff --git a/parser/Gtk.metadata b/parser/Gtk.metadata index d5ec70dc6..a5abb09c6 100644 --- a/parser/Gtk.metadata +++ b/parser/Gtk.metadata @@ -71,7 +71,7 @@ gtk_toggle_button_new_with_mnemonic - gtk_label_new_with_mnemonic + gtk_label_new gtk_menu_item_new_with_mnemonic diff --git a/sample/GnomeHelloWorld.cs b/sample/GnomeHelloWorld.cs index 507b83a37..bad145b97 100644 --- a/sample/GnomeHelloWorld.cs +++ b/sample/GnomeHelloWorld.cs @@ -152,7 +152,7 @@ namespace GtkSamples { int idx = (int) sa.Args[0]; Event ev = (Event) sa.Args[1]; - if (ev.Type == EventType.TwoButtonPress) { + if (ev.IsValid && ev.Type == EventType.TwoButtonPress) { g_spawn_command_line_async ("mono " + entries[idx].program, IntPtr.Zero); } } diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata index d5ec70dc6..a5abb09c6 100644 --- a/sources/Gtk.metadata +++ b/sources/Gtk.metadata @@ -71,7 +71,7 @@ gtk_toggle_button_new_with_mnemonic - gtk_label_new_with_mnemonic + gtk_label_new gtk_menu_item_new_with_mnemonic