From 32f12c714b7c0c1de2b318cc6f8499d0b492bc36 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sat, 29 Nov 2003 23:48:14 +0000 Subject: [PATCH] 2003-11-29 Mike Kestner * */Makefile.in : remove the nowarns * gdk/Rectangle.custom : add System.Drawing.Rect implicit cast op. * sample/Size.cs : use System.Drawing.Rectangles * sample/GnomeHelloWorld.cs : remove an unneeded null check svn path=/trunk/gtk-sharp/; revision=20612 --- ChangeLog | 7 +++++++ art/Makefile.in | 2 +- atk/Makefile.in | 2 +- gda/Makefile.in | 2 +- gdk/Makefile.in | 2 +- gdk/Rectangle.custom | 5 +++++ glade/Makefile.in | 2 +- gnome/Makefile.in | 2 +- gnomedb/Makefile.in | 2 +- gst/Makefile.in | 2 +- gtk/Makefile.in | 2 +- gtkhtml/Makefile.in | 2 +- pango/Makefile.in | 2 +- rsvg/Makefile.in | 2 +- sample/GnomeHelloWorld.cs | 2 +- sample/Size.cs | 6 +++--- 16 files changed, 28 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a63be3c9..b87031210 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-11-29 Mike Kestner + + * */Makefile.in : remove the nowarns + * gdk/Rectangle.custom : add System.Drawing.Rect implicit cast op. + * sample/Size.cs : use System.Drawing.Rectangles + * sample/GnomeHelloWorld.cs : remove an unneeded null check + 2003-11-29 Mike Kestner * generator/StructBase.cs : remove ==/!= operator generation. diff --git a/art/Makefile.in b/art/Makefile.in index fc30b27dd..5d8fa7e63 100755 --- a/art/Makefile.in +++ b/art/Makefile.in @@ -18,7 +18,7 @@ generated-stamp: $(APIS) ../generator/gapi_codegen.exe Art.metadata --assembly-name=art-sharp && touch generated-stamp $(ASSEMBLY): generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r System.Drawing -r ../glib/glib-sharp.dll \ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -r ../gdk/gdk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' diff --git a/atk/Makefile.in b/atk/Makefile.in index 7d03136d0..fe2be163a 100644 --- a/atk/Makefile.in +++ b/atk/Makefile.in @@ -15,7 +15,7 @@ generated-stamp: $(APIS) ../generator/gapi_codegen.exe Atk.metadata --assembly-name=art-sharp && touch generated-stamp $(ASSEMBLY): generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ -o $(ASSEMBLY) --recurse '*.cs' diff --git a/gda/Makefile.in b/gda/Makefile.in index 2268805dc..5b9b6de54 100755 --- a/gda/Makefile.in +++ b/gda/Makefile.in @@ -16,7 +16,7 @@ generated-stamp: $(APIS) ../generator/gapi_codegen.exe Gda.metadata --assembly-name=gda-sharp && touch generated-stamp $(ASSEMBLY): generated-stamp *.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r ../glib/glib-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' clean: diff --git a/gdk/Makefile.in b/gdk/Makefile.in index ef22ead49..ac1089d29 100755 --- a/gdk/Makefile.in +++ b/gdk/Makefile.in @@ -16,7 +16,7 @@ generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe Gdk.metadata --assembly-name=gdk-sharp && touch generated-stamp $(ASSEMBLY): *.cs generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r System.Drawing -r ../glib/glib-sharp.dll \ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -o $(ASSEMBLY) --recurse '*.cs' diff --git a/gdk/Rectangle.custom b/gdk/Rectangle.custom index 50cf8459b..7d2f322ea 100644 --- a/gdk/Rectangle.custom +++ b/gdk/Rectangle.custom @@ -29,3 +29,8 @@ public Rectangle (int x, int y, int width, int height) this.height = height; } +public static implicit operator System.Drawing.Rectangle (Gdk.Rectangle rect) +{ + return new System.Drawing.Rectangle (rect.x, rect.y, rect.width, rect.height); +} + diff --git a/glade/Makefile.in b/glade/Makefile.in index 150913ade..e7fda982d 100755 --- a/glade/Makefile.in +++ b/glade/Makefile.in @@ -20,7 +20,7 @@ generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe --assembly-name=art-sharp && touch generated-stamp $(ASSEMBLY): *.cs generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r System.Drawing -r ../glib/glib-sharp.dll \ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -r ../gdk/gdk-sharp.dll -r ../gtk/gtk-sharp.dll \ diff --git a/gnome/Makefile.in b/gnome/Makefile.in index 56b4a25c0..681a31bfd 100755 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -22,7 +22,7 @@ generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe Gnome.metadata --assembly-name=gnome-sharp && touch generated-stamp $(ASSEMBLY): *.cs generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r System.Drawing -r ../glib/glib-sharp.dll \ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -r ../art/art-sharp.dll -r ../gdk/gdk-sharp.dll \ diff --git a/gnomedb/Makefile.in b/gnomedb/Makefile.in index 40b298ae4..0d049b9d1 100755 --- a/gnomedb/Makefile.in +++ b/gnomedb/Makefile.in @@ -24,7 +24,7 @@ generated-stamp: $(APIS) ../generator/gapi_codegen.exe GnomeDb.metadata --assembly-name=gnomedb-sharp && touch generated-stamp $(ASSEMBLY): *.cs generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ -r ../atk/atk-sharp.dll -r ../art/art-sharp.dll \ -r ../gdk/gdk-sharp.dll -r ../gtk/gtk-sharp.dll \ diff --git a/gst/Makefile.in b/gst/Makefile.in index 1e1fd76f6..81d5a55d1 100755 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -13,7 +13,7 @@ generated-stamp: $(APIS) ../generator/gapi_codegen.exe && touch generated-stamp $(ASSEMBLY): *.cs generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r glib-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' clean: diff --git a/gtk/Makefile.in b/gtk/Makefile.in index 505ae04de..7d950b5d2 100755 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -18,7 +18,7 @@ generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe Gtk.metadata --assembly-name=gtk-sharp && touch generated-stamp $(ASSEMBLY): *.cs generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r System.Drawing -r ../glib/glib-sharp.dll \ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -r ../gdk/gdk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' diff --git a/gtkhtml/Makefile.in b/gtkhtml/Makefile.in index a4c1c0bc5..d5205990a 100755 --- a/gtkhtml/Makefile.in +++ b/gtkhtml/Makefile.in @@ -22,7 +22,7 @@ generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe Gtk.meta --assembly-name=gtkhtml-sharp && touch generated-stamp $(ASSEMBLY): generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll \ -r ../gtk/gtk-sharp.dll -r ../art/art-sharp.dll \ diff --git a/pango/Makefile.in b/pango/Makefile.in index 779fef3aa..f597315e5 100644 --- a/pango/Makefile.in +++ b/pango/Makefile.in @@ -13,7 +13,7 @@ generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe Pango.metadata && touch generated-stamp $(ASSEMBLY): *.cs generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r System.Drawing -r ../glib/glib-sharp.dll \ -o $(ASSEMBLY) --recurse '*.cs' diff --git a/rsvg/Makefile.in b/rsvg/Makefile.in index aa0e9b247..ca662f912 100644 --- a/rsvg/Makefile.in +++ b/rsvg/Makefile.in @@ -21,7 +21,7 @@ generated-stamp: $(APIS) ../generator/gapi_codegen.exe --assembly-name=rsvg-sharp && touch generated-stamp $(ASSEMBLY): *.cs generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library \ + $(MCS) --unsafe --target library \ -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll \ -r ../gtk/gtk-sharp.dll -r ../art/art-sharp.dll \ diff --git a/sample/GnomeHelloWorld.cs b/sample/GnomeHelloWorld.cs index 371a1d7f5..1798a53e9 100644 --- a/sample/GnomeHelloWorld.cs +++ b/sample/GnomeHelloWorld.cs @@ -160,7 +160,7 @@ namespace GtkSamples { if (type != Gdk.WindowType.Child) Console.WriteLine ("Struct field accessors appear to be broken."); - if ((ev != Gdk.EventButton.Zero) && ev.type == EventType.TwoButtonPress && ev.button == 1) { + if (ev.type == EventType.TwoButtonPress && ev.button == 1) { g_spawn_command_line_async ("mono " + entries[idx].program, IntPtr.Zero); } } diff --git a/sample/Size.cs b/sample/Size.cs index 0e895b56f..0ec9bcdb6 100644 --- a/sample/Size.cs +++ b/sample/Size.cs @@ -32,10 +32,10 @@ namespace GtkSamples { static void Size_Allocated (object obj, SizeAllocatedArgs args) { - Gdk.Rectangle rect = args.Allocation; - if (rect == Gdk.Rectangle.Zero) + System.Drawing.Rectangle rect = args.Allocation; + if (rect == System.Drawing.Rectangle.Empty) Console.WriteLine ("ERROR: Allocation is null!"); - Console.WriteLine ("Size: ({0}, {1})", rect.width, rect.height); + Console.WriteLine ("Size: ({0}, {1})", rect.Width, rect.Height); } } }