* WISHLIST: Removed, content added to TODO
* TODO: Updated, with content from TODO and
various things which has been done has been removed.
* autogen.sh: Added, autoconf enabled.
* configure.in: Added, autoconf enabled.
* patches: Removed, not needed anymore
* makefile: All of them removed, autoconf enabled
* makefile.am: All of them added, autoconf enabled
* .cvsignore: Added
* README: Does not mention make prefix option anymore
* COPYRIGHT: Removed
* COPYING: Added
* INSTALL: Added
* dia/cvsignore: Added makefile and makefile.in
* doc/cvsignore: Ditto
* glue/cvsignore: Ditto
* sample/cvsignore: Ditto
* sources/cvsignore: Ditto
svn path=/trunk/diacanvas-sharp/; revision=19777
This commit is contained in:
Martin Willemoes Hansen
Родитель
bf639c2af3
Коммит
d66db62c71
|
|
@ -0,0 +1,12 @@
|
|||
aclocal.m4
|
||||
autom4te.cache
|
||||
config.guess
|
||||
config.log
|
||||
config.status
|
||||
config.sub
|
||||
configure
|
||||
Makefile
|
||||
Makefile.in
|
||||
install-sh
|
||||
missing
|
||||
mkinstalldirs
|
||||
21
ChangeLog
21
ChangeLog
|
|
@ -1,3 +1,24 @@
|
|||
2003-11-10 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
|
||||
* WISHLIST: Removed, content added to TODO
|
||||
* TODO: Updated, with content from TODO and
|
||||
various things which has been done has been removed.
|
||||
* autogen.sh: Added, autoconf enabled.
|
||||
* configure.in: Added, autoconf enabled.
|
||||
* patches: Removed, not needed anymore
|
||||
* makefile: All of them removed, autoconf enabled
|
||||
* makefile.am: All of them added, autoconf enabled
|
||||
* .cvsignore: Added
|
||||
* README: Does not mention make prefix option anymore
|
||||
* COPYRIGHT: Removed
|
||||
* COPYING: Added
|
||||
* INSTALL: Added
|
||||
* dia/cvsignore: Added makefile and makefile.in
|
||||
* doc/cvsignore: Ditto
|
||||
* glue/cvsignore: Ditto
|
||||
* sample/cvsignore: Ditto
|
||||
* sources/cvsignore: Ditto
|
||||
|
||||
2003-11-05 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
|
||||
* doc/en/Dia/WrapMode.xml: Added
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
Installing DiaCanvas#
|
||||
=====================
|
||||
|
||||
CVS edition:
|
||||
|
||||
./autogen.sh --prefix=YOUR_PREFIX
|
||||
|
||||
Source tarball edition:
|
||||
|
||||
./configure --prefix=YOUR_PREFIX
|
||||
1
NEWS
1
NEWS
|
|
@ -2,6 +2,7 @@
|
|||
=====
|
||||
|
||||
* Works with DiaCanvas2-0.10.0
|
||||
* Autoconf enabled
|
||||
|
||||
0.2.0
|
||||
=====
|
||||
|
|
|
|||
1
PROBLEMS
1
PROBLEMS
|
|
@ -3,7 +3,6 @@ Array fields are not generated properly
|
|||
|
||||
warning: array field Dia.ShapeText.affine probably incorrectly generated
|
||||
warning: array field Dia.CanvasIter.data probably incorrectly generated
|
||||
warning: array field Dia.DashStyle.dash probably incorrectly generated
|
||||
warning: array field Dia.ShapeImage.affine probably incorrectly generated
|
||||
|
||||
This seems to be a problem with the generator.
|
||||
|
|
|
|||
7
README
7
README
|
|
@ -6,13 +6,6 @@ mono-0.28
|
|||
gtk-sharp-0.12
|
||||
diacanvas2-0.10.0
|
||||
|
||||
====
|
||||
Make
|
||||
====
|
||||
|
||||
If you use another prefix than /usr then you can specify it to make like
|
||||
this: make -e PREFIX=/myprefix
|
||||
|
||||
======
|
||||
Sample
|
||||
======
|
||||
|
|
|
|||
8
TODO
8
TODO
|
|
@ -15,5 +15,11 @@ Document API
|
|||
Dia.Variable
|
||||
Dia.Constraint
|
||||
Dia.Solver
|
||||
Dia.Strength
|
||||
Dia.CanvasViewItem.EmitEvent
|
||||
|
||||
|
||||
Free form drawing
|
||||
-----------------
|
||||
Investigate, if it is posible to use
|
||||
DiaCanvas# as a free form drawing canvas.
|
||||
Requested by Miguel De Icaza.
|
||||
4
WISHLIST
4
WISHLIST
|
|
@ -1,4 +0,0 @@
|
|||
Free form drawing (miguel)
|
||||
autoconf (gonzalo)
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
automake -a
|
||||
aclocal
|
||||
autoconf
|
||||
./configure $*
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
AC_INIT(README)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AM_INIT_AUTOMAKE(diacanvas-sharp, 0.3.0)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
dnl Defines CC to avoid warnings
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
|
||||
AC_OUTPUT([
|
||||
makefile
|
||||
dia/makefile
|
||||
doc/makefile
|
||||
glue/makefile
|
||||
sample/makefile
|
||||
sources/makefile
|
||||
])
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
diacanvas-sharp.dll
|
||||
generated
|
||||
generated-stamp
|
||||
makefile
|
||||
makefile.in
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
PREFIX= /usr
|
||||
|
||||
APIS= diacanvas-api.xml diacanvas-symbols.xml
|
||||
|
||||
INCLUDE_APIS= $(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
|
||||
INCLUDE_APIS= @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 \
|
||||
|
|
@ -30,9 +28,9 @@ $(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
|
||||
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)
|
||||
|
|
@ -1 +1,3 @@
|
|||
tmp
|
||||
makefile
|
||||
makefile.in
|
||||
|
|
|
|||
Двоичные данные
doc/diacanvas-docs.zip
Двоичные данные
doc/diacanvas-docs.zip
Двоичный файл не отображается.
|
|
@ -0,0 +1,2 @@
|
|||
makefile
|
||||
makefile.in
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
PREFIX= /usr
|
||||
GLUE_LIB= libdiacanvassharpglue.so
|
||||
|
||||
all: $(GLUE_LIB)
|
||||
|
|
@ -7,7 +6,7 @@ $(GLUE_LIB): *.c
|
|||
gcc *.c -shared -fPIC -o $(GLUE_LIB) `pkg-config --cflags --libs gtk+-2.0 libart-2.0 libgnomeui-2.0`
|
||||
|
||||
install: $(GLUE_LIB)
|
||||
install -o root -g root -m 644 $(GLUE_LIB) $(PREFIX)/lib
|
||||
install -o root -g root -m 644 $(GLUE_LIB) @prefix@/lib
|
||||
|
||||
clean:
|
||||
rm -f $(GLUE_LIB)
|
||||
|
|
@ -28,4 +28,3 @@ distclean: clean
|
|||
$(MAKE) -C doc distclean;
|
||||
|
||||
rm -r CVS
|
||||
rm -r patches
|
||||
|
|
@ -1,242 +0,0 @@
|
|||
Index: ChangeLog
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/ChangeLog,v
|
||||
retrieving revision 1.135
|
||||
diff -u -r1.135 ChangeLog
|
||||
--- ChangeLog 9 Oct 2003 07:50:14 -0000 1.135
|
||||
+++ ChangeLog 9 Oct 2003 10:55:25 -0000
|
||||
@@ -1,3 +1,13 @@
|
||||
+2003-10-09 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
+
|
||||
+ * src/dia-canvas.[ch]: Changed dia_canvas_new_pango_layout to dia_canvas_get_pango_layout
|
||||
+ and registred it as a property.
|
||||
+ * src/dia-shape-art.[ch]: Changed dia_shape_art_new_pango_layout to dia_shape_art_get_pango_layout.
|
||||
+ * src/dia-shape-x.[ch]: Changed dia_shape_x_new_pango_layout to dia_shape_x_get_pango_layout and
|
||||
+ fixed a typo.
|
||||
+ * src/dia-shape.c: Updated to use dia_canvas_get_pango_layout
|
||||
+ * src/diacanvas.defs: Ditto
|
||||
+
|
||||
2003-10-04 Arjan Molenaar <arjanmolenaar@hetnet.nl>
|
||||
|
||||
* python/setup.py: New file. Build the python bindings in a Pythonic
|
||||
Index: src/dia-canvas.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas.c,v
|
||||
retrieving revision 1.62
|
||||
diff -u -r1.62 dia-canvas.c
|
||||
--- src/dia-canvas.c 1 Sep 2003 18:26:43 -0000 1.62
|
||||
+++ src/dia-canvas.c 9 Oct 2003 10:55:26 -0000
|
||||
@@ -52,7 +52,8 @@
|
||||
PROP_GRID_OFS_X,
|
||||
PROP_GRID_OFS_Y,
|
||||
PROP_GRID_COLOR,
|
||||
- PROP_GRID_BG
|
||||
+ PROP_GRID_BG,
|
||||
+ PROP_PANGO_LAYOUT
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
@@ -264,6 +265,13 @@
|
||||
G_MAXULONG,
|
||||
DIA_COLOR (200,200,200),
|
||||
G_PARAM_READWRITE));
|
||||
+ g_object_class_install_property (object_class,
|
||||
+ PROP_PANGO_LAYOUT,
|
||||
+ g_param_spec_object ("pango_layout",
|
||||
+ _("A newly created pango layout"),
|
||||
+ _("A newly created pango layout"),
|
||||
+ PANGO_TYPE_LAYOUT,
|
||||
+ G_PARAM_READABLE));
|
||||
|
||||
klass->extents_changed = NULL;
|
||||
//klass->move = NULL;
|
||||
@@ -407,6 +415,9 @@
|
||||
case PROP_GRID_BG:
|
||||
g_value_set_ulong (value, canvas->grid_bg);
|
||||
break;
|
||||
+ case PROP_PANGO_LAYOUT:
|
||||
+ g_value_set_object (value, dia_canvas_get_pango_layout());
|
||||
+ break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
@@ -887,14 +898,14 @@
|
||||
}
|
||||
|
||||
/**
|
||||
- * dia_canvas_new_pango_layout:
|
||||
+ * dia_canvas_get_pango_layout:
|
||||
*
|
||||
* Returns a usable #PangoLayout object.
|
||||
*
|
||||
* Return value: A newly created PangoLayout object.
|
||||
**/
|
||||
PangoLayout*
|
||||
-dia_canvas_new_pango_layout (void)
|
||||
+dia_canvas_get_pango_layout (void)
|
||||
{
|
||||
/* Make the context static, this will save time for future references.
|
||||
*/
|
||||
Index: src/dia-canvas.h
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas.h,v
|
||||
retrieving revision 1.65
|
||||
diff -u -r1.65 dia-canvas.h
|
||||
--- src/dia-canvas.h 15 Jul 2003 18:46:37 -0000 1.65
|
||||
+++ src/dia-canvas.h 9 Oct 2003 10:55:26 -0000
|
||||
@@ -171,7 +171,7 @@
|
||||
void dia_canvas_add_constraint (DiaCanvas *canvas, DiaConstraint *c);
|
||||
void dia_canvas_remove_constraint (DiaCanvas *canvas, DiaConstraint *c);
|
||||
|
||||
-PangoLayout* dia_canvas_new_pango_layout (void);
|
||||
+PangoLayout* dia_canvas_get_pango_layout (void);
|
||||
|
||||
void dia_canvas_redraw_views (DiaCanvas *canvas);
|
||||
|
||||
Index: src/dia-shape-art.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape-art.c,v
|
||||
retrieving revision 1.49
|
||||
diff -u -r1.49 dia-shape-art.c
|
||||
--- src/dia-shape-art.c 20 Jul 2003 14:14:21 -0000 1.49
|
||||
+++ src/dia-shape-art.c 9 Oct 2003 10:55:26 -0000
|
||||
@@ -70,17 +70,17 @@
|
||||
}
|
||||
|
||||
/**
|
||||
- * dia_shape_art_new_pango_layout:
|
||||
+ * dia_shape_art_get_pango_layout:
|
||||
*
|
||||
* Return a new PangoLayout belonging to the AA renderer.
|
||||
*
|
||||
* Return value: A newly created PangoLayout object.
|
||||
**/
|
||||
PangoLayout*
|
||||
-dia_shape_art_new_pango_layout (void)
|
||||
+dia_shape_art_get_pango_layout (void)
|
||||
{
|
||||
/* Use the default (canvas) PangoLayout setup. */
|
||||
- return dia_canvas_new_pango_layout ();
|
||||
+ return dia_canvas_get_pango_layout ();
|
||||
}
|
||||
|
||||
static ArtSVP*
|
||||
@@ -679,7 +679,7 @@
|
||||
// } else {
|
||||
// }
|
||||
|
||||
- layout = dia_shape_art_new_pango_layout ();
|
||||
+ layout = dia_shape_art_get_pango_layout ();
|
||||
max_width = (gint) ceil (shape->max_width);
|
||||
max_height = (gint) ceil (shape->max_height);
|
||||
dia_shape_text_fill_pango_layout ((DiaShape*) shape,
|
||||
Index: src/dia-shape-art.h
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape-art.h,v
|
||||
retrieving revision 1.7
|
||||
diff -u -r1.7 dia-shape-art.h
|
||||
--- src/dia-shape-art.h 9 Oct 2002 13:17:25 -0000 1.7
|
||||
+++ src/dia-shape-art.h 9 Oct 2003 10:55:26 -0000
|
||||
@@ -36,7 +36,7 @@
|
||||
void dia_shape_art_render (DiaShape *shape, DiaCanvasViewItem *item,
|
||||
GnomeCanvasBuf *buf);
|
||||
|
||||
-PangoLayout* dia_shape_art_new_pango_layout (void);
|
||||
+PangoLayout* dia_shape_art_get_pango_layout (void);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
Index: src/dia-shape-x.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape-x.c,v
|
||||
retrieving revision 1.15
|
||||
diff -u -r1.15 dia-shape-x.c
|
||||
--- src/dia-shape-x.c 3 Jun 2003 18:08:38 -0000 1.15
|
||||
+++ src/dia-shape-x.c 9 Oct 2003 10:55:26 -0000
|
||||
@@ -361,9 +361,9 @@
|
||||
}
|
||||
|
||||
PangoLayout*
|
||||
-dia_shape_x_new_pango_layout (void)
|
||||
+dia_shape_x_get_pango_layout (void)
|
||||
{
|
||||
- g_warning (G_STRLOC": No default fonr layout has been set...");
|
||||
+ g_warning (G_STRLOC": No default font layout has been set...");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Index: src/dia-shape-x.h
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape-x.h,v
|
||||
retrieving revision 1.5
|
||||
diff -u -r1.5 dia-shape-x.h
|
||||
--- src/dia-shape-x.h 9 Oct 2002 13:17:25 -0000 1.5
|
||||
+++ src/dia-shape-x.h 9 Oct 2003 10:55:26 -0000
|
||||
@@ -38,7 +38,7 @@
|
||||
int x, int y,
|
||||
int width, int height);
|
||||
|
||||
-PangoLayout* dia_shape_x_new_pango_layout (void);
|
||||
+PangoLayout* dia_shape_x_get_pango_layout (void);
|
||||
|
||||
|
||||
G_END_DECLS
|
||||
Index: src/dia-shape.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape.c,v
|
||||
retrieving revision 1.41
|
||||
diff -u -r1.41 dia-shape.c
|
||||
--- src/dia-shape.c 9 Oct 2003 07:50:15 -0000 1.41
|
||||
+++ src/dia-shape.c 9 Oct 2003 10:55:26 -0000
|
||||
@@ -1250,7 +1250,7 @@
|
||||
g_return_val_if_fail (shape != NULL, NULL);
|
||||
g_return_val_if_fail (shape->type == DIA_SHAPE_TEXT, NULL);
|
||||
|
||||
- layout = dia_canvas_new_pango_layout ();
|
||||
+ layout = dia_canvas_get_pango_layout ();
|
||||
g_return_val_if_fail (layout != NULL, NULL);
|
||||
|
||||
if (fill)
|
||||
Index: src/diacanvas.defs
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/diacanvas.defs,v
|
||||
retrieving revision 1.2
|
||||
diff -u -r1.2 diacanvas.defs
|
||||
--- src/diacanvas.defs 6 May 2002 09:43:54 -0000 1.2
|
||||
+++ src/diacanvas.defs 9 Oct 2003 10:55:26 -0000
|
||||
@@ -385,9 +385,9 @@
|
||||
)
|
||||
)
|
||||
|
||||
-(define-function dia_canvas_new_pango_layout
|
||||
+(define-function dia_canvas_get_pango_layout
|
||||
(in-module "Dia")
|
||||
- (c-name "dia_canvas_new_pango_layout")
|
||||
+ (c-name "dia_canvas_get_pango_layout")
|
||||
(return-type "PangoLayout*")
|
||||
)
|
||||
|
||||
@@ -2071,9 +2071,9 @@
|
||||
)
|
||||
)
|
||||
|
||||
-(define-function dia_shape_art_new_pango_layout
|
||||
+(define-function dia_shape_art_get_pango_layout
|
||||
(in-module "Dia")
|
||||
- (c-name "dia_shape_art_new_pango_layout")
|
||||
+ (c-name "dia_shape_art_get_pango_layout")
|
||||
(return-type "PangoLayout*")
|
||||
)
|
||||
|
||||
@@ -2095,9 +2095,9 @@
|
||||
)
|
||||
)
|
||||
|
||||
-(define-function dia_shape_x_new_pango_layout
|
||||
+(define-function dia_shape_x_get_pango_layout
|
||||
(in-module "Dia")
|
||||
- (c-name "dia_shape_x_new_pango_layout")
|
||||
+ (c-name "dia_shape_x_get_pango_layout")
|
||||
(return-type "PangoLayout*")
|
||||
)
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
--- dia-canvas-view.c 2003-03-18 19:21:22.000000000 +0100
|
||||
+++ ../../diacanvas2-0.9.2.old/src/dia-canvas-view.c 2003-07-18 13:35:40.000000000 +0200
|
||||
@@ -217,10 +217,12 @@
|
||||
G_PARAM_READABLE));
|
||||
g_object_class_install_property (gobject_class,
|
||||
PROP_ZOOM,
|
||||
- g_param_spec_object ("zoom",
|
||||
+ g_param_spec_double ("zoom",
|
||||
_("Zoom"),
|
||||
_("Set the zoom factor"),
|
||||
- DIA_TYPE_TOOL,
|
||||
+ -G_MAXDOUBLE,
|
||||
+ G_MAXDOUBLE,
|
||||
+ 0.0,
|
||||
G_PARAM_READWRITE));
|
||||
g_object_class_install_property (gobject_class,
|
||||
PROP_TOOL,
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
39c39
|
||||
< AC_PATH_PROGS(PYTHON, python2.2 python2 python)
|
||||
---
|
||||
> AC_PATH_PROGS(PYTHON, python2.3 python2.2 python2 python)
|
||||
|
|
@ -1,132 +0,0 @@
|
|||
? removal_of_persistens.diff
|
||||
Index: dia-canvas-bezier.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas-bezier.c,v
|
||||
retrieving revision 1.5
|
||||
diff -u -r1.5 dia-canvas-bezier.c
|
||||
--- dia-canvas-bezier.c 25 Mar 2002 15:44:53 -0000 1.5
|
||||
+++ dia-canvas-bezier.c 13 Sep 2003 14:19:40 -0000
|
||||
@@ -74,16 +74,9 @@
|
||||
static void
|
||||
dia_canvas_bezier_class_init (DiaCanvasBezierClass *klass)
|
||||
{
|
||||
-#ifdef USE_PERSISTENT
|
||||
- static guint saveable_args[] = { ARG_BEZIER_WIDTH, ARG_COLOR, ARG_CAP, ARG_JOIN, 0 };
|
||||
-#endif
|
||||
GObjectClass *object_class;
|
||||
DiaCanvasItemClass *item_class;
|
||||
|
||||
-#ifdef USE_PERSISTENT
|
||||
- ((DiaPersistentClass*) klass)->saveable_args = saveable_args;
|
||||
-#endif
|
||||
-
|
||||
object_class = (GObjectClass*) klass;
|
||||
//item_class = (DiaCanvasItemClass*) klass;
|
||||
item_class = DIA_CANVAS_ITEM_CLASS (klass);
|
||||
Index: dia-canvas-element.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas-element.c,v
|
||||
retrieving revision 1.35
|
||||
diff -u -r1.35 dia-canvas-element.c
|
||||
--- dia-canvas-element.c 20 Jul 2003 14:14:21 -0000 1.35
|
||||
+++ dia-canvas-element.c 13 Sep 2003 14:19:41 -0000
|
||||
@@ -80,16 +80,9 @@
|
||||
static void
|
||||
dia_canvas_element_class_init (DiaCanvasElementClass *klass)
|
||||
{
|
||||
-#ifdef USE_PERSISTENT
|
||||
- static guint saveable_args[] = { ARG_WIDTH, ARG_HEIGHT, 0 };
|
||||
-#endif
|
||||
GObjectClass *object_class;
|
||||
DiaCanvasItemClass *item_class;
|
||||
|
||||
-#ifdef USE_PERSISTENT
|
||||
- ((DiaPersistentClass*) klass)->saveable_args = saveable_args;
|
||||
-#endif
|
||||
-
|
||||
object_class = (GObjectClass*) klass;
|
||||
item_class = DIA_CANVAS_ITEM_CLASS (klass);
|
||||
|
||||
Index: dia-canvas-ellipse.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas-ellipse.c,v
|
||||
retrieving revision 1.6
|
||||
diff -u -r1.6 dia-canvas-ellipse.c
|
||||
--- dia-canvas-ellipse.c 11 Feb 2002 15:40:54 -0000 1.6
|
||||
+++ dia-canvas-ellipse.c 13 Sep 2003 14:19:41 -0000
|
||||
@@ -228,8 +228,6 @@
|
||||
GtkObjectClass *object_class;
|
||||
DiaCanvasItemClass *item_class;
|
||||
|
||||
- ((DiaPersistentClass*) klass)->saveable_args = saveable_args;
|
||||
-
|
||||
object_class = (GtkObjectClass*) klass;
|
||||
//item_class = (DiaCanvasItemClass*) klass;
|
||||
item_class = DIA_CANVAS_ITEM_CLASS (klass);
|
||||
Index: dia-canvas-line.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas-line.c,v
|
||||
retrieving revision 1.43
|
||||
diff -u -r1.43 dia-canvas-line.c
|
||||
--- dia-canvas-line.c 20 Jul 2003 14:14:21 -0000 1.43
|
||||
+++ dia-canvas-line.c 13 Sep 2003 14:19:41 -0000
|
||||
@@ -135,16 +135,9 @@
|
||||
static void
|
||||
dia_canvas_line_class_init (DiaCanvasLineClass *klass)
|
||||
{
|
||||
-#ifdef USE_PERSISTENT
|
||||
- static guint saveable_args[] = { ARG_LINE_WIDTH, ARG_COLOR, ARG_CAP, ARG_JOIN, 0 };
|
||||
-#endif
|
||||
GObjectClass *object_class;
|
||||
DiaCanvasItemClass *item_class;
|
||||
|
||||
-#ifdef USE_PERSISTENT
|
||||
- ((DiaPersistentClass*) klass)->saveable_args = saveable_args;
|
||||
-#endif
|
||||
-
|
||||
object_class = (GObjectClass*) klass;
|
||||
item_class = DIA_CANVAS_ITEM_CLASS (klass);
|
||||
|
||||
Index: dia-handle.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-handle.c,v
|
||||
retrieving revision 1.39
|
||||
diff -u -r1.39 dia-handle.c
|
||||
--- dia-handle.c 19 May 2003 17:32:24 -0000 1.39
|
||||
+++ dia-handle.c 13 Sep 2003 14:19:41 -0000
|
||||
@@ -21,9 +21,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <libart_lgpl/art_affine.h>
|
||||
-#ifdef USE_PERSISTENT
|
||||
-#include "dia-storage.h"
|
||||
-#endif
|
||||
#include "diamarshal.h"
|
||||
#include "diatypebuiltins.h"
|
||||
#include "dia-canvas-i18n.h"
|
||||
@@ -59,13 +56,6 @@
|
||||
static void dia_handle_finalize (GObject *object);
|
||||
static void pos_w_changed (DiaVariable *variable,
|
||||
DiaHandle *handle);
|
||||
-#ifdef USE_PERSISTENT
|
||||
-static gboolean dia_handle_load (DiaStorage *storage, DiaAttributeNode *attr,
|
||||
- DiaPersistent *object, GtkArg *value);
|
||||
-static gboolean dia_handle_save (DiaStorage *storage, DiaAttributeNode *attr,
|
||||
- DiaPersistent *object, GtkArg *value);
|
||||
-static void dia_handle_free (GtkArg *value);
|
||||
-#endif
|
||||
|
||||
static GObjectClass *parent_class = NULL;
|
||||
//static guint handle_signals[LAST_SIGNAL] = { 0 };
|
||||
@@ -113,11 +103,6 @@
|
||||
|
||||
parent_class = g_type_class_peek_parent (klass);
|
||||
|
||||
-#ifdef USE_PERSISTENT
|
||||
- dia_storage_register_type (dia_handle_get_type (),
|
||||
- dia_handle_load, dia_handle_save,
|
||||
- dia_handle_free);
|
||||
-#endif
|
||||
object_class->dispose = dia_handle_dispose;
|
||||
object_class->finalize = dia_handle_finalize;
|
||||
object_class->set_property = dia_handle_set_property;
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
Index: .cvsignore
|
||||
===================================================================
|
||||
RCS file: /cvsroot/diacanvas/diacanvas2/unit_tests/.cvsignore,v
|
||||
retrieving revision 1.1
|
||||
diff -u -r1.1 .cvsignore
|
||||
--- .cvsignore 16 May 2002 14:10:59 -0000 1.1
|
||||
+++ .cvsignore 24 Aug 2003 15:41:52 -0000
|
||||
@@ -2,4 +2,13 @@
|
||||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
-
|
||||
+test-canvas
|
||||
+test-canvas-item
|
||||
+test-canvas-view
|
||||
+test-constraint
|
||||
+test-expression
|
||||
+test-geometry
|
||||
+test-shape-art
|
||||
+test-solver
|
||||
+test-strength
|
||||
+test-variable
|
||||
|
|
@ -1,267 +0,0 @@
|
|||
? AssemblyTagGenerator.diff
|
||||
? AssemblyTagGenerator2.diff
|
||||
Index: CallbackGen.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/CallbackGen.cs,v
|
||||
retrieving revision 1.24
|
||||
diff -u -r1.24 CallbackGen.cs
|
||||
--- CallbackGen.cs 23 Jul 2003 17:19:19 -0000 1.24
|
||||
+++ CallbackGen.cs 31 Aug 2003 10:34:34 -0000
|
||||
@@ -17,7 +17,7 @@
|
||||
public CallbackGen (XmlElement ns, XmlElement elem) : base (ns, elem)
|
||||
{
|
||||
if (elem ["parameters"] != null)
|
||||
- parms = new Parameters (elem ["parameters"], NS);
|
||||
+ parms = new Parameters (elem ["parameters"], NS, Assembly);
|
||||
}
|
||||
|
||||
public string MarshalType {
|
||||
@@ -54,10 +54,10 @@
|
||||
return CallByName (var);
|
||||
}
|
||||
|
||||
- public string GenWrapper (string ns)
|
||||
+ public string GenWrapper (string ns, string assembly)
|
||||
{
|
||||
char sep = Path.DirectorySeparatorChar;
|
||||
- string dir = ".." + sep + ns.ToLower() + sep + "generated";
|
||||
+ string dir = ".." + sep + assembly + sep + "generated";
|
||||
|
||||
if (!Directory.Exists (dir))
|
||||
Directory.CreateDirectory (dir);
|
||||
@@ -238,7 +238,7 @@
|
||||
|
||||
CloseWriter (sw);
|
||||
|
||||
- GenWrapper (NS);
|
||||
+ GenWrapper (NS, Assembly);
|
||||
|
||||
Statistics.CBCount++;
|
||||
}
|
||||
Index: Ctor.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/Ctor.cs,v
|
||||
retrieving revision 1.12
|
||||
diff -u -r1.12 Ctor.cs
|
||||
--- Ctor.cs 14 Jun 2003 17:30:32 -0000 1.12
|
||||
+++ Ctor.cs 31 Aug 2003 10:34:34 -0000
|
||||
@@ -41,7 +41,7 @@
|
||||
this.container_type = container_type;
|
||||
XmlElement parms_elem = elem ["parameters"];
|
||||
if (parms_elem != null)
|
||||
- parms = new Parameters (parms_elem, container_type.NS);
|
||||
+ parms = new Parameters (parms_elem, container_type.NS, container_type.Assembly);
|
||||
if (elem.HasAttribute ("preferred"))
|
||||
preferred = true;
|
||||
}
|
||||
Index: GenBase.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/GenBase.cs,v
|
||||
retrieving revision 1.11
|
||||
diff -u -r1.11 GenBase.cs
|
||||
--- GenBase.cs 2 Jul 2003 18:13:24 -0000 1.11
|
||||
+++ GenBase.cs 31 Aug 2003 10:34:35 -0000
|
||||
@@ -52,6 +52,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ public string Assembly {
|
||||
+ get {
|
||||
+ if (ns.HasAttribute ("assembly"))
|
||||
+ return ns.GetAttribute ("assembly");
|
||||
+ else
|
||||
+ return NS.ToLower();
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
public string QualifiedName {
|
||||
get {
|
||||
return NS + "." + Name;
|
||||
@@ -66,7 +75,7 @@
|
||||
protected StreamWriter CreateWriter ()
|
||||
{
|
||||
char sep = Path.DirectorySeparatorChar;
|
||||
- string dir = ".." + sep + NS.ToLower() + sep + "generated";
|
||||
+ string dir = ".." + sep + Assembly + sep + "generated";
|
||||
if (!Directory.Exists(dir)) {
|
||||
Console.WriteLine ("creating " + dir);
|
||||
Directory.CreateDirectory(dir);
|
||||
@@ -99,7 +108,7 @@
|
||||
public void AppendCustom (StreamWriter sw)
|
||||
{
|
||||
char sep = Path.DirectorySeparatorChar;
|
||||
- string custom = ".." + sep + NS.ToLower() + sep + Name + ".custom";
|
||||
+ string custom = ".." + sep + Assembly + sep + Name + ".custom";
|
||||
if (File.Exists(custom)) {
|
||||
sw.WriteLine ("#region Customized extensions");
|
||||
sw.WriteLine ("#line 1 \"" + Name + ".custom\"");
|
||||
Index: Method.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/Method.cs,v
|
||||
retrieving revision 1.32
|
||||
diff -u -r1.32 Method.cs
|
||||
--- Method.cs 19 Aug 2003 10:51:33 -0000 1.32
|
||||
+++ Method.cs 31 Aug 2003 10:34:35 -0000
|
||||
@@ -31,7 +31,7 @@
|
||||
{
|
||||
this.elem = elem;
|
||||
if (elem["parameters"] != null)
|
||||
- parms = new Parameters (elem["parameters"], container_type.NS);
|
||||
+ parms = new Parameters (elem["parameters"], container_type.NS, container_type.Assembly);
|
||||
this.container_type = container_type;
|
||||
this.name = elem.GetAttribute("name");
|
||||
if (name == "GetType")
|
||||
Index: ObjectGen.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/ObjectGen.cs,v
|
||||
retrieving revision 1.44
|
||||
diff -u -r1.44 ObjectGen.cs
|
||||
--- ObjectGen.cs 19 May 2003 02:45:17 -0000 1.44
|
||||
+++ ObjectGen.cs 31 Aug 2003 10:34:35 -0000
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
private ArrayList strings = new ArrayList();
|
||||
private static Hashtable namespaces = new Hashtable ();
|
||||
+ private static string assembly;
|
||||
|
||||
public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem)
|
||||
{
|
||||
@@ -49,6 +50,7 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
+ assembly = Assembly;
|
||||
}
|
||||
|
||||
public void Generate ()
|
||||
@@ -189,10 +191,10 @@
|
||||
continue;
|
||||
|
||||
char sep = Path.DirectorySeparatorChar;
|
||||
- string dir = ".." + sep + ns.ToLower () + sep + "generated";
|
||||
+ string dir = ".." + sep + assembly + sep + "generated";
|
||||
if (!Directory.Exists(dir)) {
|
||||
Console.WriteLine ("creating " + dir);
|
||||
- Directory.CreateDirectory(dir);
|
||||
+ Directory.CreateDirectory(dir);
|
||||
}
|
||||
String filename = dir + sep + "ObjectManager.cs";
|
||||
|
||||
Index: Parameters.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/Parameters.cs,v
|
||||
retrieving revision 1.33
|
||||
diff -u -r1.33 Parameters.cs
|
||||
--- Parameters.cs 28 Aug 2003 16:49:29 -0000 1.33
|
||||
+++ Parameters.cs 31 Aug 2003 10:34:35 -0000
|
||||
@@ -112,6 +112,7 @@
|
||||
|
||||
private XmlElement elem;
|
||||
private string impl_ns;
|
||||
+ private string impl_assembly;
|
||||
private string import_sig;
|
||||
private string call_string;
|
||||
private string signature;
|
||||
@@ -119,10 +120,11 @@
|
||||
private bool hide_data;
|
||||
private bool is_static;
|
||||
|
||||
- public Parameters (XmlElement elem, string impl_ns) {
|
||||
+ public Parameters (XmlElement elem, string impl_ns, string impl_assembly) {
|
||||
|
||||
this.elem = elem;
|
||||
this.impl_ns = impl_ns;
|
||||
+ this.impl_assembly = impl_assembly;
|
||||
}
|
||||
|
||||
public string CallString {
|
||||
@@ -357,7 +359,7 @@
|
||||
|
||||
if (gen is CallbackGen) {
|
||||
CallbackGen cbgen = gen as CallbackGen;
|
||||
- string wrapper = cbgen.GenWrapper(impl_ns);
|
||||
+ string wrapper = cbgen.GenWrapper(impl_ns, impl_assembly);
|
||||
sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = null;", wrapper, name);
|
||||
sw.Write (indent + "\t\t\t");
|
||||
if (p.NullOk)
|
||||
Index: Signal.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/Signal.cs,v
|
||||
retrieving revision 1.15
|
||||
diff -u -r1.15 Signal.cs
|
||||
--- Signal.cs 14 Jun 2003 17:30:32 -0000 1.15
|
||||
+++ Signal.cs 31 Aug 2003 10:34:35 -0000
|
||||
@@ -24,7 +24,7 @@
|
||||
this.elem = elem;
|
||||
this.name = elem.GetAttribute ("name");
|
||||
if (elem["parameters"] != null)
|
||||
- parms = new Parameters (elem["parameters"], container_type.NS);
|
||||
+ parms = new Parameters (elem["parameters"], container_type.NS, container_type.Assembly);
|
||||
this.container_type = container_type;
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
public bool Validate ()
|
||||
{
|
||||
- marsh = SignalHandler.GetName(elem, container_type.NS, false);
|
||||
+ marsh = SignalHandler.GetName(elem, container_type.NS, container_type.Assembly, false);
|
||||
if ((Name == "") || (marsh == "")) {
|
||||
Console.Write ("bad signal " + Name);
|
||||
Statistics.ThrottledCount++;
|
||||
@@ -83,8 +83,9 @@
|
||||
return handler;
|
||||
|
||||
string ns = container_type.NS;
|
||||
+ string assembly = container_type.Assembly;
|
||||
char sep = Path.DirectorySeparatorChar;
|
||||
- string dir = ".." + sep + ns.ToLower() + sep + "generated";
|
||||
+ string dir = ".." + sep + assembly + sep + "generated";
|
||||
|
||||
if (!Directory.Exists (dir))
|
||||
Directory.CreateDirectory (dir);
|
||||
@@ -126,12 +127,16 @@
|
||||
{
|
||||
string cname = "\"" + elem.GetAttribute("cname") + "\"";
|
||||
string ns;
|
||||
- if (implementor == null)
|
||||
+ string assembly;
|
||||
+ if (implementor == null) {
|
||||
ns = container_type.NS;
|
||||
- else
|
||||
+ assembly = container_type.Assembly;
|
||||
+ } else {
|
||||
ns = implementor.NS;
|
||||
+ assembly = implementor.Assembly;
|
||||
+ }
|
||||
|
||||
- string qual_marsh = SignalHandler.GetName(elem, ns, container_type.DoGenerate);
|
||||
+ string qual_marsh = SignalHandler.GetName(elem, ns, assembly, container_type.DoGenerate);
|
||||
|
||||
string argsname;
|
||||
string handler = GenHandler (out argsname);
|
||||
Index: SignalHandler.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/SignalHandler.cs,v
|
||||
retrieving revision 1.30
|
||||
diff -u -r1.30 SignalHandler.cs
|
||||
--- SignalHandler.cs 19 Aug 2003 04:52:25 -0000 1.30
|
||||
+++ SignalHandler.cs 31 Aug 2003 10:34:35 -0000
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
public class SignalHandler {
|
||||
|
||||
- public static string GetName(XmlElement sig, string ns, bool generate)
|
||||
+ public static string GetName(XmlElement sig, string ns, string assembly, bool generate)
|
||||
{
|
||||
XmlElement ret_elem = sig["return-type"];
|
||||
if (ret_elem == null) {
|
||||
@@ -84,7 +84,7 @@
|
||||
return ns + "." + sname;
|
||||
|
||||
char sep = Path.DirectorySeparatorChar;
|
||||
- String dir = ".." + sep + ns.ToLower() + sep + "generated";
|
||||
+ String dir = ".." + sep + assembly + sep + "generated";
|
||||
|
||||
if (!Directory.Exists(dir)) {
|
||||
Directory.CreateDirectory(dir);
|
||||
|
|
@ -1,165 +0,0 @@
|
|||
? MangleNameModifications.diff
|
||||
Index: Parameters.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/Parameters.cs,v
|
||||
retrieving revision 1.32
|
||||
diff -u -r1.32 Parameters.cs
|
||||
--- Parameters.cs 15 Jul 2003 05:52:08 -0000 1.32
|
||||
+++ Parameters.cs 27 Aug 2003 07:17:19 -0000
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
public string Name {
|
||||
get {
|
||||
- return MangleName (elem.GetAttribute("name"));
|
||||
+ return SymbolTable.Table.MangleName (elem.GetAttribute("name"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,37 +91,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
- private string MangleName(string name)
|
||||
- {
|
||||
- switch (name) {
|
||||
- case "string":
|
||||
- return "str1ng";
|
||||
- case "event":
|
||||
- return "evnt";
|
||||
- case "null":
|
||||
- return "is_null";
|
||||
- case "object":
|
||||
- return "objekt";
|
||||
- case "params":
|
||||
- return "parms";
|
||||
- case "ref":
|
||||
- return "reference";
|
||||
- case "in":
|
||||
- return "in_param";
|
||||
- case "out":
|
||||
- return "out_param";
|
||||
- case "fixed":
|
||||
- return "mfixed";
|
||||
- case "byte":
|
||||
- return "_byte";
|
||||
- case "new":
|
||||
- return "_new";
|
||||
- default:
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- return name;
|
||||
- }
|
||||
public string StudlyName {
|
||||
get {
|
||||
string name = elem.GetAttribute("name");
|
||||
Index: StructBase.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/StructBase.cs,v
|
||||
retrieving revision 1.37
|
||||
diff -u -r1.37 StructBase.cs
|
||||
--- StructBase.cs 23 Jul 2003 17:19:19 -0000 1.37
|
||||
+++ StructBase.cs 27 Aug 2003 07:17:19 -0000
|
||||
@@ -141,7 +141,7 @@
|
||||
if (IsBit (field))
|
||||
name = String.Format ("_bitfield{0}", bitfields++);
|
||||
else
|
||||
- name += MangleName (field.GetAttribute ("cname"));
|
||||
+ name += SymbolTable.Table.MangleName (field.GetAttribute ("cname"));
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -151,14 +151,14 @@
|
||||
string c_type, type, name;
|
||||
if (!GetFieldInfo (field, out c_type, out type, out name))
|
||||
return false;
|
||||
- sw.WriteLine ("\t\tpublic {0} {1};", type, name);
|
||||
+ sw.WriteLine ("\t\tpublic {0} {1};", type, SymbolTable.Table.MangleName (name));
|
||||
|
||||
if (field.HasAttribute("array_len"))
|
||||
Console.WriteLine ("warning: array field {0}.{1} probably incorrectly generated", QualifiedName, name);
|
||||
SymbolTable table = SymbolTable.Table;
|
||||
|
||||
string wrapped = table.GetCSType (c_type);
|
||||
- string wrapped_name = MangleName (field.GetAttribute ("cname"));
|
||||
+ string wrapped_name = SymbolTable.Table.MangleName (field.GetAttribute ("cname"));
|
||||
if (table.IsObject (c_type)) {
|
||||
sw.WriteLine ();
|
||||
sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
|
||||
@@ -188,29 +188,6 @@
|
||||
}
|
||||
|
||||
return true;
|
||||
- }
|
||||
-
|
||||
- private String MangleName(String name)
|
||||
- {
|
||||
- if (name == "string") {
|
||||
- return "str1ng";
|
||||
- } else if (name == "event") {
|
||||
- return "evnt";
|
||||
- } else if (name == "null") {
|
||||
- return "is_null";
|
||||
- } else if (name == "object") {
|
||||
- return "objekt";
|
||||
- } else if (name == "ref") {
|
||||
- return "reference";
|
||||
- } else if (name == "params") {
|
||||
- return "parms";
|
||||
- } else if (name == "fixed") {
|
||||
- return "mfixed";
|
||||
- } else if (name == "in") {
|
||||
- return "inn";
|
||||
- } else {
|
||||
- return name;
|
||||
- }
|
||||
}
|
||||
|
||||
public virtual void Generate ()
|
||||
Index: SymbolTable.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/SymbolTable.cs,v
|
||||
retrieving revision 1.46
|
||||
diff -u -r1.46 SymbolTable.cs
|
||||
--- SymbolTable.cs 11 Jul 2003 02:00:11 -0000 1.46
|
||||
+++ SymbolTable.cs 27 Aug 2003 07:17:19 -0000
|
||||
@@ -292,6 +292,38 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
+ public string MangleName(string name)
|
||||
+ {
|
||||
+ switch (name) {
|
||||
+ case "string":
|
||||
+ return "str1ng";
|
||||
+ case "event":
|
||||
+ return "evnt";
|
||||
+ case "null":
|
||||
+ return "is_null";
|
||||
+ case "object":
|
||||
+ return "objekt";
|
||||
+ case "params":
|
||||
+ return "parms";
|
||||
+ case "ref":
|
||||
+ return "reference";
|
||||
+ case "in":
|
||||
+ return "in_param";
|
||||
+ case "out":
|
||||
+ return "out_param";
|
||||
+ case "fixed":
|
||||
+ return "mfixed";
|
||||
+ case "byte":
|
||||
+ return "_byte";
|
||||
+ case "new":
|
||||
+ return "_new";
|
||||
+ case "base":
|
||||
+ return "_base";
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return name;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
-
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
? Method.cs.diff
|
||||
Index: Method.cs
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/generator/Method.cs,v
|
||||
retrieving revision 1.31
|
||||
diff -u -r1.31 Method.cs
|
||||
--- Method.cs 23 Jul 2003 17:19:19 -0000 1.31
|
||||
+++ Method.cs 14 Aug 2003 13:57:51 -0000
|
||||
@@ -217,7 +217,7 @@
|
||||
sw.Write("static ");
|
||||
sw.Write(safety);
|
||||
Method dup = null;
|
||||
- if (Name == "ToString")
|
||||
+ if (Name == "ToString" && Params == null)
|
||||
sw.Write("override ");
|
||||
else if (Name == "GetGType" && container_type is ObjectGen)
|
||||
sw.Write("new ");
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -1,158 +0,0 @@
|
|||
? GnomePrintFixes.diff
|
||||
Index: ChangeLog
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/ChangeLog,v
|
||||
retrieving revision 1.484
|
||||
diff -u -r1.484 ChangeLog
|
||||
--- ChangeLog 5 Oct 2003 00:37:24 -0000 1.484
|
||||
+++ ChangeLog 8 Oct 2003 07:12:04 -0000
|
||||
@@ -1,3 +1,12 @@
|
||||
+2003-10-06 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
+
|
||||
+ * gnome/PrintJob.custom: Added default ctor.
|
||||
+ * gnome/PrintDialog.custom: Added overloaded ctor with fewer parameters.
|
||||
+ * sources/Gnome.metadata: Disabled default ctor for PrintJob,
|
||||
+ changed type from int to PrintDialogFlags for PrintDialog ctor and
|
||||
+ changed return type from byte to string for PrintConfig.Get.
|
||||
+ * api/Makefile: Added gtkhtml-api.xml
|
||||
+
|
||||
2003-10-04 Mike Kestner <mkestner@ximian.com>
|
||||
|
||||
* generator/CallbackGen.cs : remove CloseWriter call.
|
||||
Index: api/gnome-api.xml
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/api/gnome-api.xml,v
|
||||
retrieving revision 1.17
|
||||
diff -u -r1.17 gnome-api.xml
|
||||
--- api/gnome-api.xml 2 Oct 2003 15:48:36 -0000 1.17
|
||||
+++ api/gnome-api.xml 8 Oct 2003 07:12:07 -0000
|
||||
@@ -4937,7 +4937,7 @@
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="Get" cname="gnome_print_config_get">
|
||||
- <return-type type="guchar*"/>
|
||||
+ <return-type type="gchar*"/>
|
||||
<parameters>
|
||||
<parameter type="const-gchar*" name="key"/>
|
||||
</parameters>
|
||||
@@ -5056,7 +5056,7 @@
|
||||
</parameters>
|
||||
</constructor>
|
||||
</object>
|
||||
- <object name="PrintJob" cname="GnomePrintJob" parent="GObject">
|
||||
+ <object name="PrintJob" cname="GnomePrintJob" parent="GObject" disabledefaultconstructor="1">
|
||||
<method name="Close" cname="gnome_print_job_close">
|
||||
<return-type type="gint"/>
|
||||
</method>
|
||||
@@ -6512,7 +6512,7 @@
|
||||
<parameters>
|
||||
<parameter type="GnomePrintJob*" name="gpj"/>
|
||||
<parameter type="const-gchar*" name="title"/>
|
||||
- <parameter type="gint" name="flags"/>
|
||||
+ <parameter type="GnomePrintDialogFlags" name="flags"/>
|
||||
</parameters>
|
||||
</constructor>
|
||||
<method name="SetCopies" cname="gnome_print_dialog_set_copies">
|
||||
Index: gnome/PrintDialog.custom
|
||||
===================================================================
|
||||
RCS file: gnome/PrintDialog.custom
|
||||
diff -N gnome/PrintDialog.custom
|
||||
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
||||
+++ gnome/PrintDialog.custom 8 Oct 2003 07:12:10 -0000
|
||||
@@ -0,0 +1,12 @@
|
||||
+//
|
||||
+// PrintDialog.custom - customizations
|
||||
+//
|
||||
+// Author: Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
+//
|
||||
+// Copyright (C) 2003 Martin Willemoes Hansen
|
||||
+//
|
||||
+// This code is inserted after the automatically generated code.
|
||||
+//
|
||||
+
|
||||
+public PrintDialog (Gnome.PrintJob gpj, string title)
|
||||
+ : this (gpj, title, 0) {}
|
||||
Index: gnome/PrintJob.custom
|
||||
===================================================================
|
||||
RCS file: gnome/PrintJob.custom
|
||||
diff -N gnome/PrintJob.custom
|
||||
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
||||
+++ gnome/PrintJob.custom 8 Oct 2003 07:12:10 -0000
|
||||
@@ -0,0 +1,14 @@
|
||||
+//
|
||||
+// PrintJob.custom - customizations
|
||||
+//
|
||||
+// Author: Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
+//
|
||||
+// Copyright (C) 2003 Martin Willemoes Hansen
|
||||
+//
|
||||
+// This code is inserted after the automatically generated code.
|
||||
+//
|
||||
+
|
||||
+public PrintJob()
|
||||
+{
|
||||
+ Raw = gnome_print_job_new (PrintConfig.Default().Handle);
|
||||
+}
|
||||
Index: sources/Gnome.metadata
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/Gnome.metadata,v
|
||||
retrieving revision 1.12
|
||||
diff -u -r1.12 Gnome.metadata
|
||||
--- sources/Gnome.metadata 29 Sep 2003 11:05:30 -0000 1.12
|
||||
+++ sources/Gnome.metadata 8 Oct 2003 07:12:10 -0000
|
||||
@@ -319,6 +319,17 @@
|
||||
</data>
|
||||
</rule>
|
||||
|
||||
+<!-- disable default constructor -->
|
||||
+<rule>
|
||||
+ <class name="GnomePrintJob"/>
|
||||
+ <data>
|
||||
+ <attribute target="class">
|
||||
+ <name>disabledefaultconstructor</name>
|
||||
+ <value>1</value>
|
||||
+ </attribute>
|
||||
+ </data>
|
||||
+</rule>
|
||||
+
|
||||
<!-- misc -->
|
||||
<rule>
|
||||
<class name="GnomeAbout">
|
||||
@@ -332,6 +343,18 @@
|
||||
</attribute>
|
||||
</data>
|
||||
</rule>
|
||||
+<rule>
|
||||
+ <class name="GnomePrintDialog">
|
||||
+ <method>gnome_print_dialog_new</method>
|
||||
+ </class>
|
||||
+ <data>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">flags</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>GnomePrintDialogFlags</value>
|
||||
+ </attribute>
|
||||
+ </data>
|
||||
+</rule>
|
||||
|
||||
<!-- Use const-gchar* instead of const-guchar*, when the value is realy a string -->
|
||||
<rule>
|
||||
@@ -499,6 +522,18 @@
|
||||
<attribute target="return">
|
||||
<name>type</name>
|
||||
<value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ </data>
|
||||
+</rule>
|
||||
+
|
||||
+<rule>
|
||||
+ <class name="GnomePrintConfig">
|
||||
+ <method>Get</method>
|
||||
+ </class>
|
||||
+ <data>
|
||||
+ <attribute target="return">
|
||||
+ <name>type</name>
|
||||
+ <value>gchar*</value>
|
||||
</attribute>
|
||||
</data>
|
||||
</rule>
|
||||
|
|
@ -1,183 +0,0 @@
|
|||
Index: .cvsignore
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/.cvsignore,v
|
||||
retrieving revision 1.3
|
||||
diff -u -r1.3 .cvsignore
|
||||
--- .cvsignore 26 Aug 2003 21:35:28 -0000 1.3
|
||||
+++ .cvsignore 15 Sep 2003 15:37:25 -0000
|
||||
@@ -3,13 +3,13 @@
|
||||
gtk+-2.2.2
|
||||
gtkhtml-3.0.8
|
||||
libart_lgpl-2.3.10
|
||||
-libgda-0.90.0
|
||||
+libgda-1.0.0
|
||||
libglade-2.0.0
|
||||
-libgnome-2.0.1
|
||||
-libgnomecanvas-2.0.1
|
||||
-libgnomedb-0.90.0
|
||||
+libgnome-2.2.3
|
||||
+libgnomecanvas-2.2.1
|
||||
+libgnomedb-1.0.0
|
||||
libgnomeprint-2.2.1.3
|
||||
libgnomeprintui-2.2.1.3
|
||||
-libgnomeui-2.0.1
|
||||
-librsvg-2.0.1
|
||||
+libgnomeui-2.2.2
|
||||
+librsvg-2.2.5
|
||||
pango-1.2.3
|
||||
Index: Gda.metadata
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/Gda.metadata,v
|
||||
retrieving revision 1.4
|
||||
diff -u -r1.4 Gda.metadata
|
||||
--- Gda.metadata 12 Jul 2003 17:59:05 -0000 1.4
|
||||
+++ Gda.metadata 15 Sep 2003 15:37:25 -0000
|
||||
@@ -90,6 +90,24 @@
|
||||
</attribute>
|
||||
</data>
|
||||
</rule>
|
||||
+
|
||||
+<!-- new_flags -->
|
||||
+<rule>
|
||||
+ <class name="GdaDataModelArray">
|
||||
+ <method>SetNColumns</method>
|
||||
+ </class>
|
||||
+ <class name="GdaDataModelHash">
|
||||
+ <method>SetNColumns</method>
|
||||
+ </class>
|
||||
+ <data>
|
||||
+ <attribute target="method">
|
||||
+ <name>new_flag</name>
|
||||
+ <value>1</value>
|
||||
+ </attribute>
|
||||
+ </data>
|
||||
+</rule>
|
||||
+
|
||||
+<!-- hides -->
|
||||
<rule>
|
||||
<class name="GdaDataModel">
|
||||
<method>ToXmlNode</method>
|
||||
Index: Gdk.metadata
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/Gdk.metadata,v
|
||||
retrieving revision 1.19
|
||||
diff -u -r1.19 Gdk.metadata
|
||||
--- Gdk.metadata 6 Sep 2003 18:11:13 -0000 1.19
|
||||
+++ Gdk.metadata 15 Sep 2003 15:37:25 -0000
|
||||
@@ -163,7 +163,7 @@
|
||||
</class>
|
||||
<data>
|
||||
<attribute target="param">
|
||||
- <filter level="type">GdkDrawable*</filter>
|
||||
+ <filter level="type">GdkDrawable**</filter>
|
||||
<name>pass_as</name>
|
||||
<value>out</value>
|
||||
</attribute>
|
||||
Index: Gtk.metadata
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/Gtk.metadata,v
|
||||
retrieving revision 1.60
|
||||
diff -u -r1.60 Gtk.metadata
|
||||
--- Gtk.metadata 28 Aug 2003 16:35:19 -0000 1.60
|
||||
+++ Gtk.metadata 15 Sep 2003 15:37:25 -0000
|
||||
@@ -1869,6 +1869,31 @@
|
||||
</data>
|
||||
</rule>
|
||||
|
||||
+<!-- Hides related to gtkhtml and gnomeprint Can be removed when gtkhtml get its own assembly -->
|
||||
+<rule>
|
||||
+ <class name="GtkHTML">
|
||||
+ <method>PrintWithHeaderFooter</method>
|
||||
+ <method>PrintSetMaster</method>
|
||||
+ <method>Print</method>
|
||||
+ <method>PrintGetPagesNum</method>
|
||||
+ </class>
|
||||
+ <data>
|
||||
+ <attribute target="method">
|
||||
+ <name>hidden</name>
|
||||
+ <value>1</value>
|
||||
+ </attribute>
|
||||
+ </data>
|
||||
+</rule>
|
||||
+<rule>
|
||||
+ <class name="GtkHTMLPrintCallback"/>
|
||||
+ <data>
|
||||
+ <attribute target="class">
|
||||
+ <name>hidden</name>
|
||||
+ <value>1</value>
|
||||
+ </attribute>
|
||||
+ </data>
|
||||
+</rule>
|
||||
+
|
||||
<!-- overloads -->
|
||||
<rule>
|
||||
<class name="GtkBox">
|
||||
Index: gtk-sharp.sources
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/gtk-sharp.sources,v
|
||||
retrieving revision 1.20
|
||||
diff -u -r1.20 gtk-sharp.sources
|
||||
--- gtk-sharp.sources 26 Aug 2003 21:35:28 -0000 1.20
|
||||
+++ gtk-sharp.sources 15 Sep 2003 15:37:25 -0000
|
||||
@@ -3,16 +3,16 @@
|
||||
gtk+-2.2.2/gdk Gdk libgdk-win32-2.0-0.dll
|
||||
gtk+-2.2.2/gdk-pixbuf Gdk libgdk_pixbuf-2.0-0.dll
|
||||
gtk+-2.2.2/gtk Gtk libgtk-win32-2.0-0.dll
|
||||
-libgnome-2.0.1/libgnome Gnome gnome-2
|
||||
-libgnomecanvas-2.0.1/libgnomecanvas Gnome gnomecanvas-2
|
||||
-libgnomeui-2.0.1/libgnomeui Gnome gnomeui-2
|
||||
+libgnome-2.2.3/libgnome Gnome gnome-2
|
||||
+libgnomecanvas-2.2.1/libgnomecanvas Gnome gnomecanvas-2
|
||||
+libgnomeui-2.2.2/libgnomeui Gnome gnomeui-2
|
||||
libgnomeprint-2.2.1.3/libgnomeprint Gnome gnomeprint-2-2
|
||||
libgnomeprintui-2.2.1.3/libgnomeprintui Gnome gnomeprint-2-2
|
||||
libgnomeprintui-2.2.1.3/libgnomeprintui/gpaui Gnome gnomeprint-2.2
|
||||
gtkhtml-3.0.8/src Gtk gtkhtml-3.0
|
||||
libglade-2.0.0/glade Glade libglade-2.0-0.dll
|
||||
libart_lgpl-2.3.10 Art art_lgpl
|
||||
-libgda-0.90.0/libgda Gda gda-2
|
||||
-libgnomedb-0.90.0/libgnomedb GnomeDb gnomedb-2
|
||||
+libgda-1.0.0/libgda Gda gda-2
|
||||
+libgnomedb-1.0.0/libgnomedb GnomeDb gnomedb-2
|
||||
gstreamer-0.4.2/gst Gst gstreamer
|
||||
-librsvg-2.0.1 Rsvg rsvg-2
|
||||
+librsvg-2.2.5 Rsvg rsvg-2
|
||||
Index: makefile
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/makefile,v
|
||||
retrieving revision 1.15
|
||||
diff -u -r1.15 makefile
|
||||
--- makefile 26 Aug 2003 21:35:28 -0000 1.15
|
||||
+++ makefile 15 Sep 2003 15:37:25 -0000
|
||||
@@ -1,19 +1,18 @@
|
||||
DOWNLOADS = \
|
||||
- http://ftp.gnome.org/pub/GNOME/sources/pango/1.2/pango-1.2.3.tar.gz \
|
||||
- http://ftp.gnome.org/pub/GNOME/sources/atk/1.2/atk-1.2.4.tar.gz \
|
||||
- http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.2/gtk+-2.2.2.tar.gz \
|
||||
- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnome-2.0.1.tar.gz \
|
||||
- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnomecanvas-2.0.1.tar.gz \
|
||||
- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnomeui-2.0.1.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/pango-1.2.3.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/atk-1.2.4.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/gtk+-2.2.2.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnome-2.2.3.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnomecanvas-2.2.1.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnomeui-2.2.2.tar.gz \
|
||||
http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnomeprint-2.2.1.3.tar.gz \
|
||||
http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnomeprintui-2.2.1.3.tar.gz \
|
||||
- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libglade-2.0.0.tar.gz \
|
||||
- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.3/sources/libart_lgpl-2.3.10.tar.gz \
|
||||
- ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.90.0/libgda-0.90.0.tar.gz \
|
||||
- ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.90.0/libgnomedb-0.90.0.tar.gz \
|
||||
- ftp://unc.dl.sourceforge.net/sourceforge/gstreamer/gstreamer-0.4.2.tar.gz \
|
||||
- http://ftp.gnome.org/pub/GNOME/sources/gstreamer/0.4/gstreamer-0.4.2.tar.gz \
|
||||
- http://ftp.gnome.org/pub/gnome/sources/librsvg/2.0/librsvg-2.0.1.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libglade-2.0.0.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.3/sources/libart_lgpl-2.3.10.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/librsvg-2.2.5.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/sources/gstreamer/0.4/gstreamer-0.4.2.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/sources/libgda/1.0/libgda-1.0.0.tar.gz \
|
||||
+ http://ftp.gnome.org/pub/GNOME/sources/libgnomedb/1.0/libgnomedb-1.0.0.tar.gz \
|
||||
|
||||
GTKHTML_SOURCES = \
|
||||
gtkhtml-3.0.8/src/gtkhtml.c \
|
||||
|
|
@ -1,703 +0,0 @@
|
|||
? const-gucharVsconst-gchar.diff
|
||||
Index: ChangeLog
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/ChangeLog,v
|
||||
retrieving revision 1.476
|
||||
diff -u -r1.476 ChangeLog
|
||||
--- ChangeLog 28 Sep 2003 11:20:00 -0000 1.476
|
||||
+++ ChangeLog 29 Sep 2003 11:02:06 -0000
|
||||
@@ -1,3 +1,8 @@
|
||||
+2003-09-29 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
+
|
||||
+ * sources/Gnome.metadata: Use const-gchar* instead of const-guchar*,
|
||||
+ when the value is realy a string
|
||||
+
|
||||
2003-09-28 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
|
||||
* sources/gtk-sharp.sources: Fixed, wrong library used for libgnomeprintui
|
||||
Index: api/gnome-api.xml
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/api/gnome-api.xml,v
|
||||
retrieving revision 1.14
|
||||
diff -u -r1.14 gnome-api.xml
|
||||
--- api/gnome-api.xml 28 Sep 2003 11:20:01 -0000 1.14
|
||||
+++ api/gnome-api.xml 29 Sep 2003 11:02:10 -0000
|
||||
@@ -4549,27 +4549,27 @@
|
||||
<method name="Find" cname="gnome_font_find" shared="true">
|
||||
<return-type type="GnomeFont*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="name"/>
|
||||
+ <parameter type="const-gchar*" name="name"/>
|
||||
<parameter type="gdouble" name="size"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FindClosest" cname="gnome_font_find_closest" shared="true">
|
||||
<return-type type="GnomeFont*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="name"/>
|
||||
+ <parameter type="const-gchar*" name="name"/>
|
||||
<parameter type="gdouble" name="size"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FindClosestFromFullName" cname="gnome_font_find_closest_from_full_name" shared="true">
|
||||
<return-type type="GnomeFont*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="string"/>
|
||||
+ <parameter type="const-gchar*" name="string"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FindClosestFromWeightSlant" cname="gnome_font_find_closest_from_weight_slant" shared="true">
|
||||
<return-type type="GnomeFont*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="family"/>
|
||||
+ <parameter type="const-gchar*" name="family"/>
|
||||
<parameter type="GnomeFontWeight" name="weight"/>
|
||||
<parameter type="gboolean" name="italic"/>
|
||||
<parameter type="gdouble" name="size"/>
|
||||
@@ -4578,7 +4578,7 @@
|
||||
<method name="FindFromFullName" cname="gnome_font_find_from_full_name" shared="true">
|
||||
<return-type type="GnomeFont*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="string"/>
|
||||
+ <parameter type="const-gchar*" name="string"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetAscender" cname="gnome_font_get_ascender">
|
||||
@@ -4598,7 +4598,7 @@
|
||||
<return-type type="GnomeFontFace*"/>
|
||||
</method>
|
||||
<method name="GetFamilyName" cname="gnome_font_get_family_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetFullName" cname="gnome_font_get_full_name">
|
||||
<return-type type="guchar*"/>
|
||||
@@ -4645,7 +4645,7 @@
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetName" cname="gnome_font_get_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetPangoDescription" cname="gnome_font_get_pango_description">
|
||||
<return-type type="PangoFontDescription*"/>
|
||||
@@ -4654,7 +4654,7 @@
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetPsName" cname="gnome_font_get_ps_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetRfont" cname="gnome_font_get_rfont">
|
||||
<return-type type="GnomeRFont*"/>
|
||||
@@ -4666,7 +4666,7 @@
|
||||
<return-type type="gdouble"/>
|
||||
</method>
|
||||
<method name="GetSpeciesName" cname="gnome_font_get_species_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetType" cname="gnome_font_get_type" shared="true">
|
||||
<return-type type="GType"/>
|
||||
@@ -4708,7 +4708,7 @@
|
||||
<method name="StyleList" cname="gnome_font_style_list" shared="true">
|
||||
<return-type type="GList*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="family"/>
|
||||
+ <parameter type="const-gchar*" name="family"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="StyleListFree" cname="gnome_font_style_list_free" shared="true">
|
||||
@@ -4736,13 +4736,13 @@
|
||||
<method name="Find" cname="gnome_font_face_find" shared="true">
|
||||
<return-type type="GnomeFontFace*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="name"/>
|
||||
+ <parameter type="const-gchar*" name="name"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FindClosest" cname="gnome_font_face_find_closest" shared="true">
|
||||
<return-type type="GnomeFontFace*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="name"/>
|
||||
+ <parameter type="const-gchar*" name="name"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FindClosestFromPangoDescription" cname="gnome_font_face_find_closest_from_pango_description" shared="true">
|
||||
@@ -4760,7 +4760,7 @@
|
||||
<method name="FindClosestFromWeightSlant" cname="gnome_font_face_find_closest_from_weight_slant" shared="true">
|
||||
<return-type type="GnomeFontFace*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="family"/>
|
||||
+ <parameter type="const-gchar*" name="family"/>
|
||||
<parameter type="GnomeFontWeight" name="weight"/>
|
||||
<parameter type="gboolean" name="italic"/>
|
||||
</parameters>
|
||||
@@ -4768,8 +4768,8 @@
|
||||
<method name="FindFromFamilyAndStyle" cname="gnome_font_face_find_from_family_and_style" shared="true">
|
||||
<return-type type="GnomeFontFace*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="family"/>
|
||||
- <parameter type="const-guchar*" name="style"/>
|
||||
+ <parameter type="const-gchar*" name="family"/>
|
||||
+ <parameter type="const-gchar*" name="style"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetAscender" cname="gnome_font_face_get_ascender">
|
||||
@@ -4779,7 +4779,7 @@
|
||||
<return-type type="gdouble"/>
|
||||
</method>
|
||||
<method name="GetFamilyName" cname="gnome_font_face_get_family_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetFont" cname="gnome_font_face_get_font">
|
||||
<return-type type="GnomeFont*"/>
|
||||
@@ -4803,7 +4803,7 @@
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetGlyphPsName" cname="gnome_font_face_get_glyph_ps_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
<parameters>
|
||||
<parameter type="gint" name="glyph"/>
|
||||
</parameters>
|
||||
@@ -4843,19 +4843,19 @@
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetName" cname="gnome_font_face_get_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetNumGlyphs" cname="gnome_font_face_get_num_glyphs">
|
||||
<return-type type="gint"/>
|
||||
</method>
|
||||
<method name="GetPsName" cname="gnome_font_face_get_ps_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetSample" cname="gnome_font_face_get_sample">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetSpeciesName" cname="gnome_font_face_get_species_name">
|
||||
- <return-type type="const-guchar*"/>
|
||||
+ <return-type type="const-gchar*"/>
|
||||
</method>
|
||||
<method name="GetStdbbox" cname="gnome_font_face_get_stdbbox">
|
||||
<return-type type="const-ArtDRect*"/>
|
||||
@@ -4939,34 +4939,34 @@
|
||||
<method name="Get" cname="gnome_print_config_get">
|
||||
<return-type type="guchar*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetBoolean" cname="gnome_print_config_get_boolean">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
<parameter type="gboolean*" name="val"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetDouble" cname="gnome_print_config_get_double">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
<parameter type="gdouble*" name="val"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetInt" cname="gnome_print_config_get_int">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
<parameter type="gint*" name="val"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetLength" cname="gnome_print_config_get_length">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
<parameter type="gdouble*" name="val"/>
|
||||
<parameter type="const-GnomePrintUnit**" name="unit"/>
|
||||
</parameters>
|
||||
@@ -4987,35 +4987,35 @@
|
||||
<method name="Set" cname="gnome_print_config_set">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
- <parameter type="const-guchar*" name="value"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="value"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="SetBoolean" cname="gnome_print_config_set_boolean">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
<parameter type="gboolean" name="val"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="SetDouble" cname="gnome_print_config_set_double">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
<parameter type="gdouble" name="val"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="SetInt" cname="gnome_print_config_set_int">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
<parameter type="gint" name="val"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="SetLength" cname="gnome_print_config_set_length">
|
||||
<return-type type="gboolean"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
<parameter type="gdouble" name="val"/>
|
||||
<parameter type="const-GnomePrintUnit*" name="unit"/>
|
||||
</parameters>
|
||||
@@ -5152,14 +5152,14 @@
|
||||
<return-type type="gint"/>
|
||||
<parameters>
|
||||
<parameter type="GnomePrintContext*" name="ctx"/>
|
||||
- <parameter type="const-guchar*" name="filename"/>
|
||||
+ <parameter type="const-gchar*" name="filename"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="RenderFilePage" cname="gnome_print_meta_render_file_page" shared="true">
|
||||
<return-type type="gint"/>
|
||||
<parameters>
|
||||
<parameter type="GnomePrintContext*" name="ctx"/>
|
||||
- <parameter type="const-guchar*" name="filename"/>
|
||||
+ <parameter type="const-gchar*" name="filename"/>
|
||||
<parameter type="gint" name="page"/>
|
||||
<parameter type="gboolean" name="pageops"/>
|
||||
</parameters>
|
||||
@@ -5574,7 +5574,7 @@
|
||||
<parameter type="guint32" name="color"/>
|
||||
<parameter type="gdouble" name="kerning"/>
|
||||
<parameter type="gdouble" name="letterspace"/>
|
||||
- <parameter type="const-guchar*" name="text"/>
|
||||
+ <parameter type="const-gchar*" name="text"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FromTextSizedDumb" cname="gnome_glyphlist_from_text_sized_dumb" shared="true">
|
||||
@@ -5584,7 +5584,7 @@
|
||||
<parameter type="guint32" name="color"/>
|
||||
<parameter type="gdouble" name="kerning"/>
|
||||
<parameter type="gdouble" name="letterspace"/>
|
||||
- <parameter type="const-guchar*" name="text"/>
|
||||
+ <parameter type="const-gchar*" name="text"/>
|
||||
<parameter type="gint" name="length"/>
|
||||
</parameters>
|
||||
</method>
|
||||
@@ -5637,13 +5637,13 @@
|
||||
<method name="TextDumb" cname="gnome_glyphlist_text_dumb">
|
||||
<return-type type="void"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="text"/>
|
||||
+ <parameter type="const-gchar*" name="text"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="TextSizedDumb" cname="gnome_glyphlist_text_sized_dumb">
|
||||
<return-type type="void"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="text"/>
|
||||
+ <parameter type="const-gchar*" name="text"/>
|
||||
<parameter type="gint" name="length"/>
|
||||
</parameters>
|
||||
</method>
|
||||
@@ -5672,7 +5672,7 @@
|
||||
<method name="GetByName" cname="gnome_print_paper_get_by_name" shared="true">
|
||||
<return-type type="const-GnomePrintPaper*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="name"/>
|
||||
+ <parameter type="const-gchar*" name="name"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetBySize" cname="gnome_print_paper_get_by_size" shared="true">
|
||||
@@ -5714,13 +5714,13 @@
|
||||
<method name="GetByAbbreviation" cname="gnome_print_unit_get_by_abbreviation" shared="true">
|
||||
<return-type type="const-GnomePrintUnit*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="abbreviation"/>
|
||||
+ <parameter type="const-gchar*" name="abbreviation"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetByName" cname="gnome_print_unit_get_by_name" shared="true">
|
||||
<return-type type="const-GnomePrintUnit*"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="name"/>
|
||||
+ <parameter type="const-gchar*" name="name"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetDefault" cname="gnome_print_unit_get_default" shared="true">
|
||||
@@ -5832,7 +5832,7 @@
|
||||
<return-type type="gint"/>
|
||||
<parameters>
|
||||
<parameter type="GnomePrintContext*" name="pc"/>
|
||||
- <parameter type="const-guchar*" name="name"/>
|
||||
+ <parameter type="const-gchar*" name="name"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="Bpath" cname="gnome_print_bpath" shared="true">
|
||||
@@ -5895,7 +5895,7 @@
|
||||
<method name="DecodeAscii85" cname="gnome_print_decode_ascii85" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="guchar*" name="out"/>
|
||||
<parameter type="gint" name="in_size"/>
|
||||
</parameters>
|
||||
@@ -5909,7 +5909,7 @@
|
||||
<method name="DecodeHex" cname="gnome_print_decode_hex" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="guchar*" name="out"/>
|
||||
<parameter type="gint*" name="in_size"/>
|
||||
</parameters>
|
||||
@@ -5923,7 +5923,7 @@
|
||||
<method name="EncodeAscii85" cname="gnome_print_encode_ascii85" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="guchar*" name="out"/>
|
||||
<parameter type="gint" name="in_size"/>
|
||||
</parameters>
|
||||
@@ -5937,14 +5937,14 @@
|
||||
<method name="EncodeBlank" cname="gnome_print_encode_blank" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="gint" name="in_size"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="EncodeDeflate" cname="gnome_print_encode_deflate" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="guchar*" name="out"/>
|
||||
<parameter type="gint" name="in_size"/>
|
||||
<parameter type="gint" name="out_size"/>
|
||||
@@ -5959,7 +5959,7 @@
|
||||
<method name="EncodeDrow" cname="gnome_print_encode_drow" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="guchar*" name="out"/>
|
||||
<parameter type="gint" name="in_size"/>
|
||||
<parameter type="guchar*" name="seed"/>
|
||||
@@ -5974,7 +5974,7 @@
|
||||
<method name="EncodeHex" cname="gnome_print_encode_hex" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="guchar*" name="out"/>
|
||||
<parameter type="gint" name="in_size"/>
|
||||
</parameters>
|
||||
@@ -5988,7 +5988,7 @@
|
||||
<method name="EncodeRlc" cname="gnome_print_encode_rlc" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="guchar*" name="out"/>
|
||||
<parameter type="gint" name="in_size"/>
|
||||
</parameters>
|
||||
@@ -6002,7 +6002,7 @@
|
||||
<method name="EncodeTiff" cname="gnome_print_encode_tiff" shared="true">
|
||||
<return-type type="int"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="in"/>
|
||||
+ <parameter type="const-gchar*" name="in"/>
|
||||
<parameter type="guchar*" name="out"/>
|
||||
<parameter type="gint" name="in_size"/>
|
||||
</parameters>
|
||||
@@ -6211,14 +6211,14 @@
|
||||
<return-type type="gint"/>
|
||||
<parameters>
|
||||
<parameter type="GnomePrintContext*" name="pc"/>
|
||||
- <parameter type="const-guchar*" name="text"/>
|
||||
+ <parameter type="const-gchar*" name="text"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="ShowSized" cname="gnome_print_show_sized" shared="true">
|
||||
<return-type type="gint"/>
|
||||
<parameters>
|
||||
<parameter type="GnomePrintContext*" name="pc"/>
|
||||
- <parameter type="const-guchar*" name="text"/>
|
||||
+ <parameter type="const-gchar*" name="text"/>
|
||||
<parameter type="gint" name="bytes"/>
|
||||
</parameters>
|
||||
</method>
|
||||
@@ -6321,7 +6321,7 @@
|
||||
<method name="SetPhrase" cname="gnome_font_preview_set_phrase">
|
||||
<return-type type="void"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="phrase"/>
|
||||
+ <parameter type="const-gchar*" name="phrase"/>
|
||||
</parameters>
|
||||
</method>
|
||||
</object>
|
||||
@@ -6436,7 +6436,7 @@
|
||||
<method name="Construct" cname="gnome_print_dialog_construct">
|
||||
<return-type type="void"/>
|
||||
<parameters>
|
||||
- <parameter type="const-guchar*" name="title"/>
|
||||
+ <parameter type="const-gchar*" name="title"/>
|
||||
<parameter type="gint" name="flags"/>
|
||||
</parameters>
|
||||
</method>
|
||||
@@ -6445,8 +6445,8 @@
|
||||
<parameters>
|
||||
<parameter type="gint" name="flags"/>
|
||||
<parameter type="GtkWidget*" name="range_widget"/>
|
||||
- <parameter type="const-guchar*" name="currentlabel"/>
|
||||
- <parameter type="const-guchar*" name="rangelabel"/>
|
||||
+ <parameter type="const-gchar*" name="currentlabel"/>
|
||||
+ <parameter type="const-gchar*" name="rangelabel"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="ConstructRangeCustom" cname="gnome_print_dialog_construct_range_custom">
|
||||
@@ -6461,8 +6461,8 @@
|
||||
<parameter type="gint" name="flags"/>
|
||||
<parameter type="gint" name="start"/>
|
||||
<parameter type="gint" name="end"/>
|
||||
- <parameter type="const-guchar*" name="currentlabel"/>
|
||||
- <parameter type="const-guchar*" name="rangelabel"/>
|
||||
+ <parameter type="const-gchar*" name="currentlabel"/>
|
||||
+ <parameter type="const-gchar*" name="rangelabel"/>
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetConfig" cname="gnome_print_dialog_get_config">
|
||||
@@ -6491,7 +6491,7 @@
|
||||
<constructor cname="gnome_print_dialog_new">
|
||||
<parameters>
|
||||
<parameter type="GnomePrintJob*" name="gpj"/>
|
||||
- <parameter type="const-guchar*" name="title"/>
|
||||
+ <parameter type="const-gchar*" name="title"/>
|
||||
<parameter type="gint" name="flags"/>
|
||||
</parameters>
|
||||
</constructor>
|
||||
@@ -6510,7 +6510,7 @@
|
||||
<constructor cname="gnome_print_job_preview_new">
|
||||
<parameters>
|
||||
<parameter type="GnomePrintJob*" name="gpm"/>
|
||||
- <parameter type="const-guchar*" name="title"/>
|
||||
+ <parameter type="const-gchar*" name="title"/>
|
||||
</parameters>
|
||||
</constructor>
|
||||
</object>
|
||||
@@ -6593,7 +6593,7 @@
|
||||
<constructor cname="gpa_option_menu_new">
|
||||
<parameters>
|
||||
<parameter type="GnomePrintConfig*" name="config"/>
|
||||
- <parameter type="const-guchar*" name="key"/>
|
||||
+ <parameter type="const-gchar*" name="key"/>
|
||||
</parameters>
|
||||
</constructor>
|
||||
</object>
|
||||
Index: sources/Gnome.metadata
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/Gnome.metadata,v
|
||||
retrieving revision 1.11
|
||||
diff -u -r1.11 Gnome.metadata
|
||||
--- sources/Gnome.metadata 14 Aug 2003 14:47:19 -0000 1.11
|
||||
+++ sources/Gnome.metadata 29 Sep 2003 11:02:15 -0000
|
||||
@@ -333,6 +333,176 @@
|
||||
</data>
|
||||
</rule>
|
||||
|
||||
+<!-- Use const-gchar* instead of const-guchar*, when the value is realy a string -->
|
||||
+<rule>
|
||||
+ <class name="GnomeFont">
|
||||
+ <method>Find</method>
|
||||
+ <method>FindClosest</method>
|
||||
+ <method>FindClosestFromFullName</method>
|
||||
+ <method>FindClosestFromWeightSlant</method>
|
||||
+ <method>FindFromFullName</method>
|
||||
+ <method>StyleList</method>
|
||||
+ </class>
|
||||
+ <class name="GnomeFontFace">
|
||||
+ <method>Find</method>
|
||||
+ <method>FindClosest</method>
|
||||
+ <method>FindClosestFromWeightSlant</method>
|
||||
+ <method>FindFromFamilyAndStyle</method>
|
||||
+ </class>
|
||||
+ <class name="GnomePrintConfig">
|
||||
+ <method>Get</method>
|
||||
+ <method>GetBoolean</method>
|
||||
+ <method>GetDouble</method>
|
||||
+ <method>GetInt</method>
|
||||
+ <method>GetLength</method>
|
||||
+ <method>Set</method>
|
||||
+ <method>SetBoolean</method>
|
||||
+ <method>SetDouble</method>
|
||||
+ <method>SetInt</method>
|
||||
+ <method>SetLength</method>
|
||||
+ </class>
|
||||
+ <class name="GnomePrintDialog">
|
||||
+ <method>Construct</method>
|
||||
+ <method>ConstructRangeAny</method>
|
||||
+ <method>ConstructRangePage</method>
|
||||
+ <method>gnome_print_dialog_new</method>
|
||||
+ </class>
|
||||
+ <class name="GnomePrintMeta">
|
||||
+ <method>RenderFile</method>
|
||||
+ <method>RenderFilePage</method>
|
||||
+ </class>
|
||||
+ <class name="GnomeGlyphList">
|
||||
+ <method>FromTextDumb</method>
|
||||
+ <method>FromTextSizedDumb</method>
|
||||
+ <method>TextDumb</method>
|
||||
+ <method>TextSizedDumb</method>
|
||||
+ </class>
|
||||
+ <class name="GnomePrintPaper">
|
||||
+ <method>GetByName</method>
|
||||
+ </class>
|
||||
+ <class name="GnomePrintUnit">
|
||||
+ <method>GetByAbbreviation</method>
|
||||
+ <method>GetByName</method>
|
||||
+ </class>
|
||||
+ <class name="GnomePrint_">
|
||||
+ <method>Beginpage</method>
|
||||
+ <method>DecodeAscii85</method>
|
||||
+ <method>DecodeHex</method>
|
||||
+ <method>EncodeAscii85</method>
|
||||
+ <method>EncodeBlank</method>
|
||||
+ <method>EncodeDeflate</method>
|
||||
+ <method>EncodeDrow</method>
|
||||
+ <method>EncodeHex</method>
|
||||
+ <method>EncodeRlc</method>
|
||||
+ <method>EncodeTiff</method>
|
||||
+ <method>Show</method>
|
||||
+ <method>ShowSized</method>
|
||||
+ </class>
|
||||
+ <class name="GnomeFontPreview">
|
||||
+ <method>SetPhrase</method>
|
||||
+ </class>
|
||||
+ <class name="GnomePrintJobPreview">
|
||||
+ <method>gnome_print_job_preview_new</method>
|
||||
+ </class>
|
||||
+ <class name="GPAOptionMenu">
|
||||
+ <method>gpa_option_menu_new</method>
|
||||
+ </class>
|
||||
+ <data>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">name</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">family</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">string</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">style</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">key</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">value</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">filename</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">text</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">abbreviation</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">in</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">phrase</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">title</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">currentlabel</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ <attribute target="params">
|
||||
+ <filter level="name">rangelabel</filter>
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ </data>
|
||||
+</rule>
|
||||
+<rule>
|
||||
+ <class name="GnomeFont">
|
||||
+ <method>GetFamilyName</method>
|
||||
+ <method>GetName</method>
|
||||
+ <method>GetPsName</method>
|
||||
+ <method>GetSpeciesName</method>
|
||||
+ </class>
|
||||
+ <class name="GnomeFontFace">
|
||||
+ <method>GetFamilyName</method>
|
||||
+ <method>GetGlyphPsName</method>
|
||||
+ <method>GetName</method>
|
||||
+ <method>GetPsName</method>
|
||||
+ <method>GetSample</method>
|
||||
+ <method>GetSpeciesName</method>
|
||||
+ </class>
|
||||
+ <data>
|
||||
+ <attribute target="return">
|
||||
+ <name>type</name>
|
||||
+ <value>const-gchar*</value>
|
||||
+ </attribute>
|
||||
+ </data>
|
||||
+</rule>
|
||||
+
|
||||
<!-- null args -->
|
||||
<rule>
|
||||
<class name="GnomeIconList">
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
Index: parser/gapi.pl
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/parser/gapi.pl,v
|
||||
retrieving revision 1.1
|
||||
diff -u -r1.1 gapi.pl
|
||||
--- parser/gapi.pl 20 Aug 2002 20:35:42 -0000 1.1
|
||||
+++ parser/gapi.pl 1 Sep 2003 20:46:36 -0000
|
||||
@@ -28,10 +28,13 @@
|
||||
}
|
||||
|
||||
foreach $entry (@srcs) {
|
||||
- ($dir, $ns, $lib) = @$entry;
|
||||
+ ($dir, $ns, $lib, $assembly) = @$entry;
|
||||
+ if (!$assembly) {
|
||||
+ $assembly = "";
|
||||
+ }
|
||||
print "hi $ns\n";
|
||||
$file = $files{$ns};
|
||||
- system ("gapi_pp.pl $dir | gapi2xml.pl $ns $file $lib");
|
||||
+ system ("gapi_pp.pl $dir | gapi2xml.pl $ns $file $lib $assembly");
|
||||
}
|
||||
|
||||
foreach $ns (keys (%files)) {
|
||||
Index: parser/gapi2xml.pl
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/parser/gapi2xml.pl,v
|
||||
retrieving revision 1.40
|
||||
diff -u -r1.40 gapi2xml.pl
|
||||
--- parser/gapi2xml.pl 15 Jul 2003 05:52:08 -0000 1.40
|
||||
+++ parser/gapi2xml.pl 1 Sep 2003 20:46:36 -0000
|
||||
@@ -3,8 +3,10 @@
|
||||
# gapi2xml.pl : Generates an XML representation of GObject based APIs.
|
||||
#
|
||||
# Author: Mike Kestner <mkestner@speakeasy.net>
|
||||
+# Author: Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
#
|
||||
# <c> 2001-2003 Mike Kestner
|
||||
+# <c> 2003 Martin Willemoes Hansen
|
||||
##############################################################
|
||||
|
||||
$debug=1;
|
||||
@@ -12,12 +14,13 @@
|
||||
use XML::LibXML;
|
||||
use GAPI::Metadata;
|
||||
|
||||
-if (!$ARGV[2]) {
|
||||
- die "Usage: gapi_pp.pl <srcdir> | gapi2xml.pl <namespace> <outfile> <libname>\n";
|
||||
+if (!$ARGV[2] && !$ARGV[3]) {
|
||||
+ die "Usage: gapi_pp.pl <srcdir> | gapi2xml.pl <namespace> <outfile> <libname> [assembly]\n";
|
||||
}
|
||||
|
||||
$ns = $ARGV[0];
|
||||
$libname = $ARGV[2];
|
||||
+$assembly = $ARGV[3];
|
||||
|
||||
##############################################################
|
||||
# Check if the filename provided exists. We parse existing files into
|
||||
@@ -40,6 +43,9 @@
|
||||
$ns_elem = $doc->createElement('namespace');
|
||||
$ns_elem->setAttribute('name', $ns);
|
||||
$ns_elem->setAttribute('library', $libname);
|
||||
+if ($assembly ne "") {
|
||||
+ $ns_elem->setAttribute('assembly', $assembly);
|
||||
+}
|
||||
$root->appendChild($ns_elem);
|
||||
|
||||
##############################################################
|
||||
Index: sources/gtk-sharp.sources
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/sources/gtk-sharp.sources,v
|
||||
retrieving revision 1.20
|
||||
diff -u -r1.20 gtk-sharp.sources
|
||||
--- sources/gtk-sharp.sources 26 Aug 2003 21:35:28 -0000 1.20
|
||||
+++ sources/gtk-sharp.sources 1 Sep 2003 20:46:36 -0000
|
||||
@@ -9,7 +9,7 @@
|
||||
libgnomeprint-2.2.1.3/libgnomeprint Gnome gnomeprint-2-2
|
||||
libgnomeprintui-2.2.1.3/libgnomeprintui Gnome gnomeprint-2-2
|
||||
libgnomeprintui-2.2.1.3/libgnomeprintui/gpaui Gnome gnomeprint-2.2
|
||||
-gtkhtml-3.0.8/src Gtk gtkhtml-3.0
|
||||
+gtkhtml-3.0.8/src Gtk gtkhtml-3.0 gtkhtml
|
||||
libglade-2.0.0/glade Glade libglade-2.0-0.dll
|
||||
libart_lgpl-2.3.10 Art art_lgpl
|
||||
libgda-0.90.0/libgda Gda gda-2
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
? ByPassingOfEnumStyle.diff
|
||||
Index: ChangeLog
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/ChangeLog,v
|
||||
retrieving revision 1.477
|
||||
diff -u -r1.477 ChangeLog
|
||||
--- ChangeLog 29 Sep 2003 11:05:28 -0000 1.477
|
||||
+++ ChangeLog 1 Oct 2003 20:27:34 -0000
|
||||
@@ -1,3 +1,10 @@
|
||||
+2003-10-01 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
+
|
||||
+ * parser/gapi2xml.pl: Fixed bypassing of this kind of enum style:
|
||||
+ enum Foobar { ... };
|
||||
+ * api/gnome-api.xml: Added enums of the above style, also corrects the library
|
||||
+ used by gnomeprint.
|
||||
+
|
||||
2003-09-29 Martin Willemoes Hansen <mwh@sysrq.dk>
|
||||
|
||||
* sources/Gnome.metadata: Use const-gchar* instead of const-guchar*,
|
||||
Index: api/gnome-api.xml
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/api/gnome-api.xml,v
|
||||
retrieving revision 1.15
|
||||
diff -u -r1.15 gnome-api.xml
|
||||
--- api/gnome-api.xml 29 Sep 2003 11:05:30 -0000 1.15
|
||||
+++ api/gnome-api.xml 1 Oct 2003 20:27:37 -0000
|
||||
@@ -6259,6 +6259,26 @@
|
||||
</class>
|
||||
</namespace>
|
||||
<namespace name="Gnome" library="gnomeprintui-2-2">
|
||||
+ <enum name="PaperSelectorFlags" cname="GnomePaperSelectorFlags" type="enum">
|
||||
+ <member cname="GNOME_PAPER_SELECTOR_MARGINS" name="Margins"/>
|
||||
+ <member cname="GNOME_PAPER_SELECTOR_FEED_ORIENTATION" name="FeedOrientation"/>
|
||||
+ </enum>
|
||||
+ <enum name="PrintButtons" cname="GnomePrintButtons" type="enum">
|
||||
+ <member cname="GNOME_PRINT_DIALOG_RESPONSE_PRINT" name="Print" value="1"/>
|
||||
+ <member cname="GNOME_PRINT_DIALOG_RESPONSE_PREVIEW" name="Preview"/>
|
||||
+ <member cname="GNOME_PRINT_DIALOG_RESPONSE_CANCEL" name="Cancel"/>
|
||||
+ </enum>
|
||||
+ <enum name="PrintDialogFlags" cname="GnomePrintDialogFlags" type="enum">
|
||||
+ <member cname="GNOME_PRINT_DIALOG_RANGE" name="Range"/>
|
||||
+ <member cname="GNOME_PRINT_DIALOG_COPIES" name="Copies"/>
|
||||
+ </enum>
|
||||
+ <enum name="PrintDialogRangeFlags" cname="GnomePrintDialogRangeFlags" type="enum">
|
||||
+ <member cname="GNOME_PRINT_RANGE_CURRENT" name="Current"/>
|
||||
+ <member cname="GNOME_PRINT_RANGE_ALL" name="All"/>
|
||||
+ <member cname="GNOME_PRINT_RANGE_RANGE" name="Range"/>
|
||||
+ <member cname="GNOME_PRINT_RANGE_SELECTION" name="Selection"/>
|
||||
+ <member cname="GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE" name="SelectionUnsensitive"/>
|
||||
+ </enum>
|
||||
<enum name="PrintRangeType" cname="GnomePrintRangeType" type="enum">
|
||||
<member cname="GNOME_PRINT_RANGETYPE_NONE" name="None"/>
|
||||
<member cname="GNOME_PRINT_RANGETYPE_CUSTOM" name="Custom"/>
|
||||
@@ -6578,7 +6598,7 @@
|
||||
</object>
|
||||
<struct name="CanvasHacktextPriv" cname="GnomeCanvasHacktextPriv" opaque="true"/>
|
||||
</namespace>
|
||||
- <namespace name="Gnome" library="gnomeprintui-2.2">
|
||||
+ <namespace name="Gnome" library="gnomeprintui-2-2">
|
||||
<object name="GPAOptionMenu" cname="GPAOptionMenu" parent="GPAWidget">
|
||||
<field cname="menu" type="GtkWidget*"/>
|
||||
<field cname="node" type="GPANode*"/>
|
||||
Index: parser/gapi2xml.pl
|
||||
===================================================================
|
||||
RCS file: /cvs/public/gtk-sharp/parser/gapi2xml.pl,v
|
||||
retrieving revision 1.40
|
||||
diff -u -r1.40 gapi2xml.pl
|
||||
--- parser/gapi2xml.pl 15 Jul 2003 05:52:08 -0000 1.40
|
||||
+++ parser/gapi2xml.pl 1 Oct 2003 20:27:41 -0000
|
||||
@@ -69,6 +69,18 @@
|
||||
$edef =~ /}\s*(\w+);/;
|
||||
$ename = $1;
|
||||
$edefs{$ename} = $edef;
|
||||
+ } elsif ($line =~ /^enum/) {
|
||||
+ $line =~ /\s(\w+)\s+{/;
|
||||
+ $ename = $1;
|
||||
+ $edef = "typedef enum {\n";
|
||||
+ while ($line = <STDIN>) {
|
||||
+ $edef .= $line;
|
||||
+ last if ($line =~ /};/);
|
||||
+ }
|
||||
+ $edef =~ s/;\n/ $ename;\n/g;
|
||||
+ $edef =~ s/\n\s*//g;
|
||||
+ $edef =~ s|/\*.*?\*/||g;
|
||||
+ $edefs{$ename} = $edef;
|
||||
} elsif ($line =~ /typedef\s+\w+\s*\**\s*\(\*\s*(\w+)\)\s*\(/) {
|
||||
$fname = $1;
|
||||
$fdef = "";
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
--- /mnt/gnu/cvs/mono/gtk-sharp/parser/gapi_pp.pl 2002-08-12 21:14:43.000000000 +0200
|
||||
+++ gapi_pp.pl 2003-06-21 12:13:49.000000000 +0200
|
||||
@@ -130,8 +130,33 @@
|
||||
print "private";
|
||||
}
|
||||
|
||||
+ $comment = 0;
|
||||
+ $begin = 0;
|
||||
+ $end = 0;
|
||||
do {
|
||||
- print $line;
|
||||
+ # Following ifs strips out // and /* */ C comments
|
||||
+ if ($line =~ /\/\*/) {
|
||||
+ $comment = 1;
|
||||
+ $begin = 1;
|
||||
+ }
|
||||
+
|
||||
+ if ($comment != 1) {
|
||||
+ $line =~ s/\/\/.*//;
|
||||
+ print $line;
|
||||
+ }
|
||||
+
|
||||
+ if ($line =~ /\*\//) {
|
||||
+ $comment = 0;
|
||||
+ $end = 1;
|
||||
+ }
|
||||
+
|
||||
+ if ($begin == 1 && $end == 1) {
|
||||
+ $line =~ s/\/\*.*\*\///;
|
||||
+ print $line;
|
||||
+ }
|
||||
+
|
||||
+ $begin = 0;
|
||||
+ $end = 0;
|
||||
} until (($line = <INFILE>) =~ /^}/);
|
||||
print $line;
|
||||
}
|
||||
|
|
@ -1 +1,3 @@
|
|||
sample.exe
|
||||
makefile
|
||||
makefile.in
|
||||
|
|
|
|||
|
|
@ -1 +1,3 @@
|
|||
diacanvas2-0.10.0
|
||||
makefile
|
||||
makefile.in
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче