* api/dia-api.xml: Removed
* api/dia-symbols.xml: Removed * api/makefile: Removed * api/.cvsignore: Removed * dia/dia-api.xml: Added * dia/dia-symbols.xml: Added * dia/.cvsignore: Updated with generated-stamp * dia/makefile: Updated to generate c# code from dia-api.xml and dia-symbols.xml * sources/dia-sharp-sources.xml: Updated to put dia-api.xml in dia/ instead of api/ * sources/Dia.metadata: Hide event Event and method SetParent in CanvasItem, to work around bugs. * makefile: deleted api as a target * PROBLEMS: Added yet another problem * sample/sample.cs: Uncommented FindViewItem, since it triggers some bug svn path=/trunk/diacanvas-sharp/; revision=18799
This commit is contained in:
Родитель
1bd4cb3914
Коммит
86d3cf58bd
17
ChangeLog
17
ChangeLog
|
@ -1,3 +1,20 @@
|
|||
2003-10-09 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
|
||||
* api/dia-api.xml: Removed
|
||||
* api/dia-symbols.xml: Removed
|
||||
* api/makefile: Removed
|
||||
* api/.cvsignore: Removed
|
||||
* dia/dia-api.xml: Added
|
||||
* dia/dia-symbols.xml: Added
|
||||
* dia/.cvsignore: Updated with generated-stamp
|
||||
* dia/makefile: Updated to generate c# code from dia-api.xml and dia-symbols.xml
|
||||
* sources/dia-sharp-sources.xml: Updated to put dia-api.xml in dia/ instead of api/
|
||||
* sources/Dia.metadata: Hide event Event and method SetParent in CanvasItem,
|
||||
to work around bugs.
|
||||
* makefile: deleted api as a target
|
||||
* PROBLEMS: Added yet another problem
|
||||
* sample/sample.cs: Uncommented FindViewItem, since it triggers some bug
|
||||
|
||||
2003-10-08 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
|
||||
* doc/en/Dia/Canvas.xml: Updated to match latest DiaCanvas2 CVS
|
||||
|
|
28
PROBLEMS
28
PROBLEMS
|
@ -52,6 +52,16 @@ Results in this:
|
|||
================================================================================
|
||||
|
||||
|
||||
CanvasView.FindViewItem casting problem
|
||||
---------------------------------------
|
||||
|
||||
Unhandled Exception: System.InvalidCastException: Cannot cast from source type to destination typein <0x0007c> Dia.CanvasView:FindViewItem (Dia.CanvasItem)
|
||||
in <0x0044d> .Sample:CreateItemsProgramatically ()
|
||||
in <0x001a3> .Sample:.ctor ()
|
||||
in <0x00023> .Sample:Main ()
|
||||
|
||||
================================================================================
|
||||
|
||||
Crashes
|
||||
-------
|
||||
|
||||
|
@ -71,6 +81,24 @@ o dia-canvas-view.h
|
|||
================================================================================
|
||||
|
||||
|
||||
Wrong EventHandler
|
||||
------------------
|
||||
|
||||
event Canvas.Item.Event has the wrong event handler DiaSharp.EventHandler, it
|
||||
should just have System.EventHandler
|
||||
|
||||
================================================================================
|
||||
|
||||
|
||||
Wrongly generated SetMethod, when there is a property
|
||||
-----------------------------------------------------
|
||||
|
||||
DiaCanvasItem.Parent property is generated but
|
||||
DiaCanvasItem.SetParent is also generated.
|
||||
|
||||
================================================================================
|
||||
|
||||
|
||||
Character encoding problem (FIXED)
|
||||
----------------------------------
|
||||
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
generated-stamp
|
2364
api/dia-api.xml
2364
api/dia-api.xml
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
28
api/makefile
28
api/makefile
|
@ -1,28 +0,0 @@
|
|||
PREFIX= /usr
|
||||
|
||||
API= dia-api.xml \
|
||||
dia-symbols.xml
|
||||
|
||||
INCLUDE_API= $(PREFIX)/share/gapi/art-api.xml \
|
||||
$(PREFIX)/share/gapi/pango-api.xml \
|
||||
$(PREFIX)/share/gapi/atk-api.xml \
|
||||
$(PREFIX)/share/gapi/gnome-api.xml \
|
||||
$(PREFIX)/share/gapi/gtk-api.xml \
|
||||
$(PREFIX)/share/gapi/gdk-api.xml \
|
||||
$(PREFIX)/share/gapi/gdk-symbols.xml
|
||||
|
||||
all: generated-stamp
|
||||
|
||||
generated-stamp: $(API)
|
||||
gapi_codegen.exe --include $(INCLUDE_API) --generate $(API) && touch generated-stamp
|
||||
|
||||
install:
|
||||
install -o root -g root -m 644 dia-api.xml $(PREFIX)/share/gapi
|
||||
install -o root -g root -m 644 dia-symbols.xml $(PREFIX)/share/gapi
|
||||
|
||||
clean:
|
||||
rm -f generated-stamp
|
||||
|
||||
distclean:
|
||||
rm -r CVS
|
||||
rm .cvsignore
|
|
@ -1,2 +1,3 @@
|
|||
dia-sharp.dll
|
||||
diacanvas-sharp.dll
|
||||
generated
|
||||
generated-stamp
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
//
|
||||
// This code is inserted after the automatically generated code.
|
||||
|
||||
[DllImport ("diasharpglue")]
|
||||
[DllImport ("diacanvassharpglue")]
|
||||
extern static IntPtr diasharp_canvas_get_root (IntPtr canvas);
|
||||
|
||||
public CanvasGroup Root {
|
||||
|
|
|
@ -13,7 +13,7 @@ public static CanvasItem ItemCreate (uint object_type) {
|
|||
return new CanvasItem (dia_canvas_item_create (object_type, IntPtr.Zero));
|
||||
}
|
||||
|
||||
[DllImport("diasharpglue")]
|
||||
[DllImport("diacanvassharpglue")]
|
||||
extern static IntPtr diasharp_canvas_item_get_handles (IntPtr item);
|
||||
|
||||
public IList Handles {
|
||||
|
|
|
@ -12,7 +12,7 @@ public CanvasLine() {
|
|||
|
||||
// Struct marshalling bug workaround
|
||||
|
||||
[DllImport ("diasharpglue")]
|
||||
[DllImport ("diacanvassharpglue")]
|
||||
extern static void diasharp_canvas_line_set_point_property (IntPtr line,
|
||||
string property,
|
||||
double x, double y);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
//
|
||||
// This code is inserted after the automatically generated code.
|
||||
|
||||
[DllImport ("diasharpglue")]
|
||||
[DllImport ("diacanvassharpglue")]
|
||||
extern static IntPtr diasharp_canvas_view_get_selected_items (IntPtr view);
|
||||
|
||||
public IList SelectedItems {
|
||||
|
@ -18,7 +18,7 @@ public IList SelectedItems {
|
|||
}
|
||||
}
|
||||
|
||||
[DllImport ("diasharpglue")]
|
||||
[DllImport ("diacanvassharpglue")]
|
||||
extern static IntPtr diasharp_canvas_view_get_focus_item (IntPtr view);
|
||||
|
||||
public CanvasViewItem FocusItem {
|
||||
|
@ -27,7 +27,7 @@ public CanvasViewItem FocusItem {
|
|||
}
|
||||
}
|
||||
|
||||
[DllImport ("diasharpglue")]
|
||||
[DllImport ("diacanvassharpglue")]
|
||||
extern static IntPtr diasharp_canvas_view_get_handle_layer (IntPtr view);
|
||||
|
||||
public HandleLayer HandleLayer {
|
||||
|
|
24
dia/makefile
24
dia/makefile
|
@ -1,5 +1,16 @@
|
|||
PREFIX= /usr
|
||||
|
||||
API= diacanvas-api.xml \
|
||||
diacanvas-symbols.xml
|
||||
|
||||
INCLUDE_API= $(PREFIX)/share/gapi/art-api.xml \
|
||||
$(PREFIX)/share/gapi/pango-api.xml \
|
||||
$(PREFIX)/share/gapi/atk-api.xml \
|
||||
$(PREFIX)/share/gapi/gnome-api.xml \
|
||||
$(PREFIX)/share/gapi/gtk-api.xml \
|
||||
$(PREFIX)/share/gapi/gdk-api.xml \
|
||||
$(PREFIX)/share/gapi/gdk-symbols.xml
|
||||
|
||||
ASSEMBLIES= -r gtk-sharp.dll \
|
||||
-r glib-sharp.dll \
|
||||
-r gnome-sharp.dll \
|
||||
|
@ -7,20 +18,27 @@ ASSEMBLIES= -r gtk-sharp.dll \
|
|||
-r pango-sharp.dll \
|
||||
-r art-sharp.dll
|
||||
|
||||
LIBRARY= dia-sharp.dll
|
||||
LIBRARY= diacanvas-sharp.dll
|
||||
|
||||
all: $(LIBRARY)
|
||||
|
||||
$(LIBRARY): *.cs generated/*.cs
|
||||
generated-stamp: $(API) *.custom
|
||||
gapi_codegen.exe --include $(INCLUDE_API) --generate $(API) \
|
||||
--outdir=generated --customdir=. --assembly-name=diacanvas-sharp && touch generated-stamp
|
||||
|
||||
$(LIBRARY): generated-stamp *.cs
|
||||
mcs --unsafe -nowarn:0660,0661 --target library $(ASSEMBLIES) --recurse '*.cs' -o $(LIBRARY)
|
||||
|
||||
install:
|
||||
install -o root -g root -m 644 diacanvas-api.xml $(PREFIX)/share/gapi
|
||||
install -o root -g root -m 644 diacanvas-symbols.xml $(PREFIX)/share/gapi
|
||||
install -o root -g root -m 644 $(LIBRARY) $(PREFIX)/lib
|
||||
|
||||
clean:
|
||||
rm -f $(LIBRARY)
|
||||
rm -rf generated
|
||||
rm -f generated-stamp
|
||||
|
||||
distclean:
|
||||
rm -r CVS
|
||||
rm .cvsignore
|
||||
rm .cvsignore
|
||||
|
|
Двоичные данные
doc/diacanvas-docs.tree
Двоичные данные
doc/diacanvas-docs.tree
Двоичный файл не отображается.
Двоичные данные
doc/diacanvas-docs.zip
Двоичные данные
doc/diacanvas-docs.zip
Двоичный файл не отображается.
|
@ -772,16 +772,6 @@
|
|||
<remarks>To be added</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="Event">
|
||||
<MemberSignature Language="C#" Value="public event EventHandler Event;" />
|
||||
<MemberType>Event</MemberType>
|
||||
<ReturnValue />
|
||||
<Parameters />
|
||||
<Docs>
|
||||
<summary>To be added</summary>
|
||||
<remarks>To be added</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="Moved">
|
||||
<MemberSignature Language="C#" Value="public event DiaSharp.MovedHandler Moved;" />
|
||||
<MemberType>Event</MemberType>
|
||||
|
@ -839,5 +829,17 @@
|
|||
<remarks>To be added</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="ChildOf">
|
||||
<MemberSignature Language="C#" Value="public Dia.CanvasItem ChildOf { set; };" />
|
||||
<MemberType>Property</MemberType>
|
||||
<ReturnValue>
|
||||
<ReturnType>Dia.CanvasItem</ReturnType>
|
||||
</ReturnValue>
|
||||
<Docs>
|
||||
<summary>To be added</summary>
|
||||
<returns>a <see cref="T:Dia.CanvasItem" /></returns>
|
||||
<remarks>To be added</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
</Members>
|
||||
</Type>
|
|
@ -11,7 +11,7 @@ install: diacanvas-docs.zip diacanvas-docs.tree
|
|||
install -m 644 diacanvas-docs.source `monodoc --get-sourcesdir`
|
||||
|
||||
update:
|
||||
mono $(UPDATER) ../dia/dia-sharp.dll -o ./en -f
|
||||
mono $(UPDATER) ../dia/diacanvas-sharp.dll -o ./en -f
|
||||
|
||||
clean:
|
||||
rm -f *.tree
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PREFIX= /usr
|
||||
GLUE_LIB= libdiasharpglue.so
|
||||
GLUE_LIB= libdiacanvassharpglue.so
|
||||
|
||||
all: $(GLUE_LIB)
|
||||
|
||||
|
|
2
makefile
2
makefile
|
@ -1,4 +1,4 @@
|
|||
DIRS=glue api dia sample
|
||||
DIRS=glue dia sample
|
||||
|
||||
all: build
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
ASSEMBLIES= -r glib-sharp \
|
||||
-r gtk-sharp \
|
||||
-r glade-sharp \
|
||||
-r gdk-sharp \
|
||||
-r pango-sharp \
|
||||
-r gnome-sharp \
|
||||
-r ../dia/dia-sharp.dll
|
||||
ASSEMBLIES= -r glib-sharp \
|
||||
-r gtk-sharp \
|
||||
-r glade-sharp \
|
||||
-r gdk-sharp \
|
||||
-r pango-sharp \
|
||||
-r gnome-sharp \
|
||||
-r ../dia/diacanvas-sharp.dll
|
||||
|
||||
RESOURCES= -resource:glade/gui.glade \
|
||||
-resource:pixmaps/logo.png \
|
||||
|
@ -22,7 +22,7 @@ CODE= CanvasTextBox.cs \
|
|||
|
||||
all: $(SAMPLE)
|
||||
|
||||
$(SAMPLE): $(CODE)
|
||||
$(SAMPLE): $(CODE) ../dia/diacanvas-sharp.dll
|
||||
mcs $(ASSEMBLIES) $(RESOURCES) $(CODE) -o $(SAMPLE)
|
||||
|
||||
install:
|
||||
|
|
|
@ -96,8 +96,9 @@ public class Sample {
|
|||
canvas.Root.Add (image);
|
||||
|
||||
view.UnselectAll();
|
||||
CanvasViewItem vitem = view.FindViewItem (image);
|
||||
view.Focus (vitem);
|
||||
// Trigers a bug
|
||||
//CanvasViewItem vitem = view.FindViewItem (image);
|
||||
//view.Focus (vitem);
|
||||
}
|
||||
|
||||
void SelectionTool (object sender, EventArgs args)
|
||||
|
|
|
@ -18,6 +18,17 @@
|
|||
</rule>
|
||||
|
||||
<!-- method hides -->
|
||||
<rule>
|
||||
<class name="DiaCanvasItem">
|
||||
<method>SetParent</method>
|
||||
</class>
|
||||
<data>
|
||||
<attribute target="method">
|
||||
<name>hidden</name>
|
||||
<value>1</value>
|
||||
</attribute>
|
||||
</data>
|
||||
</rule>
|
||||
<rule>
|
||||
<class name="DiaConstraint">
|
||||
<method>AddExpression</method>
|
||||
|
@ -40,6 +51,17 @@
|
|||
</attribute>
|
||||
</data>
|
||||
</rule>
|
||||
<rule>
|
||||
<class name="DiaCanvasItem">
|
||||
<signal>Event</signal>
|
||||
</class>
|
||||
<data>
|
||||
<attribute target="signal">
|
||||
<name>hidden</name>
|
||||
<value>1</value>
|
||||
</attribute>
|
||||
</data>
|
||||
</rule>
|
||||
<rule>
|
||||
<class name="DiaCanvasText">
|
||||
<signal>TextChanged</signal>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<gapi-parser-input>
|
||||
<api filename="../api/dia-api.xml">
|
||||
<api filename="../dia/diacanvas-api.xml">
|
||||
<library name="diacanvas2">
|
||||
<namespace name="Dia">
|
||||
<dir>diacanvas2/src</dir>
|
|
@ -1,7 +1,7 @@
|
|||
PACKAGE=diacanvas2
|
||||
|
||||
all:
|
||||
gapi-parser dia-sharp-sources.xml
|
||||
gapi-parser diacanvas-sharp-sources.xml
|
||||
|
||||
get-source-code:
|
||||
#wget http://aleron.dl.sourceforge.net/sourceforge/diacanvas/$(PACKAGE).tar.gz \
|
||||
|
|
Загрузка…
Ссылка в новой задаче