2005-05-16 Mike Kestner <mkestner@novell.com>

* makefile.win32 : remove 1.0 csc, default to 1.1.
	* gtk/TreeEnumerator.cs : remove C# 2.0 usage.
	* gtk/glue/makefile.win32 : remove duplicated cellrenderer.o.
	* vte/glue/Makefile.am : use VTE_DEPENDENCIES_CFLAGS.
	* */makefile.win32 : add glue args to generation target.

svn path=/trunk/gtk-sharp/; revision=44580
This commit is contained in:
Mike Kestner 2005-05-16 19:07:27 +00:00
parent 9d8e6e7862
commit bd5af2ca78
10 changed files with 35 additions and 14 deletions

View file

@ -1,3 +1,11 @@
2005-05-16 Mike Kestner <mkestner@novell.com>
* makefile.win32 : remove 1.0 csc, default to 1.1.
* gtk/TreeEnumerator.cs : remove C# 2.0 usage.
* gtk/glue/makefile.win32 : remove duplicated cellrenderer.o.
* vte/glue/Makefile.am : use VTE_DEPENDENCIES_CFLAGS.
* */makefile.win32 : add glue args to generation target.
2005-05-16 Mike Kestner <mkestner@novell.com>
* configure.in.in : expand new vte glue makefile.

View file

@ -10,7 +10,7 @@ windows: generated-stamp
cd glue && make -f makefile.win32
generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom
../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gdk-sharp && touch generated-stamp
../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gdk-sharp --gluelib-name=gdksharpglue-2 --glue-filename=glue/generated.c --glue-includes=gdk/gdk.h && touch generated-stamp
gdk-api.xml: gdk-api.raw Gdk.metadata
cp gdk-api.raw gdk-api.xml

View file

@ -4,6 +4,7 @@ CC=gcc -mno-cygwin -mms-bitfields
DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols
GLUE_OBJS = \
generated.o \
gladexml.o \
win32dll.o

View file

@ -10,7 +10,7 @@ windows: generated-stamp
cd glue && make -f makefile.win32
generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom
../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=glade-sharp && touch generated-stamp
../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=glade-sharp --gluelib-name=gladesharpglue-2 --glue-filename=glue/generated.c --glue-includes=glade/glade.h,glade/glade-parser.h && touch generated-stamp
glade-api.xml: glade-api.raw Glade.metadata
cp glade-api.raw glade-api.xml

View file

@ -35,10 +35,10 @@ namespace Gtk
{
this.model = model;
model.RowChanged += model_changed;
model.RowDeleted += model_changed;
model.RowInserted += model_changed;
model.RowsReordered += model_changed;
model.RowChanged += new RowChangedHandler (row_changed);
model.RowDeleted += new RowDeletedHandler (row_deleted);
model.RowInserted += new RowInsertedHandler (row_inserted);
model.RowsReordered += new RowsReorderedHandler (rows_reordered);
}
public object Current
@ -76,7 +76,22 @@ namespace Gtk
changed = false;
}
private void model_changed(object o, EventArgs args)
private void row_changed(object o, RowChangedArgs args)
{
changed = true;
}
private void row_deleted(object o, RowDeletedArgs args)
{
changed = true;
}
private void row_inserted(object o, RowInsertedArgs args)
{
changed = true;
}
private void rows_reordered(object o, RowsReorderedArgs args)
{
changed = true;
}

View file

@ -6,7 +6,6 @@ DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-sy
GLUE_OBJS = \
adjustment.o \
cellrenderer.o \
cellrenderer.o \
clipboard.o \
colorseldialog.o \
container.o \

View file

@ -10,7 +10,7 @@ windows: generated-stamp
cd glue && make -f makefile.win32
generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom
../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gtk-sharp && touch generated-stamp
../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gtk-sharp --gluelib-name=gtksharpglue-2 --glue-filename=glue/generated.c --glue-includes=gtk/gtk.h && touch generated-stamp
gtk-api.xml: gtk-api.raw Gtk.metadata
cp gtk-api.raw gtk-api.xml

View file

@ -7,9 +7,7 @@ PROGFILES=`cygpath \`cygpath -m -s "$(PROGRAMFILES)"\``
## Mono v1.1.3
#CSC=$(PROGFILES)/Mono-1.1.3/bin/mcs.bat /d:WIN32
##.NET v1.1.4322
#CSC=$(ROOT)/microsoft.net/framework/v1.1.4322/csc.exe /d:WIN32
##.NET v1.0.3705
CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe /d:WIN32
CSC=$(ROOT)/microsoft.net/framework/v1.1.4322/csc.exe /d:WIN32
## --- GACUTIL ---
## .NET gacutil

View file

@ -9,7 +9,7 @@ windows: generated-stamp
../gapi-cdecl-insert --keyfile=gtk-sharp.snk pango-sharp.dll
generated-stamp: ../generator/codegen.exe $(APIS)
../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=pango-sharp && touch generated-stamp
../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=pango-sharp --gluelib-name=pangosharpglue-2 --glue-filename=glue/generated.c --glue-includes=pango/pango.h && touch generated-stamp
pango-api.xml: pango-api.raw Pango.metadata
cp pango-api.raw pango-api.xml

View file

@ -14,7 +14,7 @@ libvtesharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libvtesharpglue_2_la_LIBADD = $(VTE_LIBS)
INCLUDES = $(GTK_CFLAGS) $(VTE_CFLAGS) -I$(top_srcdir)
INCLUDES = $(VTE_DEPENDENCIES_CFLAGS) -I$(top_srcdir)
libvtesharpglue.dll: $(libvtesharpglue_2_la_OBJECTS) libvtesharpglue.rc libvtesharpglue.def
./build-dll libvtesharpglue-2 $(VERSION)