2003-11-29 Mike Kestner <mkestner@speakeasy.net>

* */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
This commit is contained in:
Mike Kestner 2003-11-29 23:48:14 +00:00
parent c8afbd3ca2
commit 32f12c714b
16 changed files with 28 additions and 16 deletions

View File

@ -1,3 +1,10 @@
2003-11-29 Mike Kestner <mkestner@speakeasy.net>
* */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 <mkestner@speakeasy.net>
* generator/StructBase.cs : remove ==/!= operator generation.

View File

@ -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'

View File

@ -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'

View File

@ -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:

View File

@ -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'

View File

@ -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);
}

View File

@ -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 \

View File

@ -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 \

View File

@ -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 \

View File

@ -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:

View File

@ -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'

View File

@ -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 \

View File

@ -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'

View File

@ -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 \

View File

@ -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);
}
}

View File

@ -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);
}
}
}