From 61997e8921aee3d3deedd11bfde71a1e446b75f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sun, 10 Jan 2010 13:40:48 +0000 Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * NEW: Use the new mascot to draw project directory icon. [EXAMPLES] * NEW: Some little changes in the Painting example. [INTERPRETER] * NEW: The component GB_INIT function now returns an integer that gives an unloading order. The higher the returned number, the later the component is unloaded. If GB_INIT returns -1, then the component shared library will not be unloaded. * NEW: Update GB_INIT functions in all components. [GB.DRAW] * BUG: Paint.Image() optional translation arguments are not inverted anymore. [GB.QT4] * BUG: If Paint.LineWidth is zero, then nothing is stroked, as in gb.gtk. * BUG: TabStrip is now correctly arranged when it has only one tab. git-svn-id: svn://localhost/gambas/trunk@2605 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.lang/.pot | 22 ++++---- app/src/gambas3/.src/Help/FHelpBrowser.class | 19 +------ app/src/gambas3/.src/Help/FHelpBrowser.form | 1 - app/src/gambas3/.src/Project.module | 2 +- app/src/gambas3/img/logo/gambas-folder-64.png | Bin 6785 -> 3701 bytes examples/examples/Drawing/Painting/.icon.png | Bin 7008 -> 4159 bytes .../Drawing/Painting/.src/FMain.class | 50 +++++++++++------- examples/examples/Drawing/Painting/Example11 | 27 +++++++--- examples/examples/Drawing/Painting/Example12 | 2 +- examples/examples/Drawing/Painting/Example14 | 3 +- examples/examples/Drawing/Painting/Example17 | 13 +++-- examples/examples/Drawing/Painting/Example21 | 18 +++---- gb.cairo/src/main.c | 2 +- gb.compress.bzlib2/src/main.c | 2 +- gb.compress.zlib/src/main.c | 2 +- gb.corba/src/main.cpp | 2 +- gb.db.firebird/src/main.cpp | 2 +- gb.db.mysql/src/main.c | 2 +- gb.db.postgresql/src/main.c | 2 +- gb.db.sqlite2/src/main.cpp | 2 +- gb.db.sqlite3/src/main.cpp | 2 +- gb.dbus/src/main.c | 2 +- gb.desktop/src/main.c | 3 +- gb.gtk/src/ext/main.cpp | 12 ++--- gb.gtk/src/gtabstrip.cpp | 3 +- gb.gtk/src/main.cpp | 2 +- gb.gtk/src/opengl/main.cpp | 2 +- gb.image.imlib/src/main.c | 2 +- gb.image.io/src/main.c | 2 +- gb.opengl/src/glsl/main.c | 2 +- gb.opengl/src/main.c | 2 +- gb.qt.kde/src/html/main.cpp | 2 +- gb.qt.kde/src/main.cpp | 2 +- gb.qt/share/gb.form.arrangement.h | 2 +- gb.qt/src/ext/main.cpp | 2 +- gb.qt/src/main.cpp | 2 +- gb.qt/src/opengl/main.cpp | 2 +- gb.qt4/src/CContainer.cpp | 28 +++++++++- gb.qt4/src/CTabStrip.cpp | 12 ++--- gb.qt4/src/CTabStrip.h | 2 + gb.qt4/src/CWidget.cpp | 2 +- gb.qt4/src/cpaint_impl.cpp | 35 ++++++------ gb.qt4/src/ext/main.cpp | 2 +- gb.qt4/src/main.cpp | 4 +- gb.qt4/src/main.h | 1 + gb.qt4/src/opengl/main.cpp | 2 +- gb.qt4/src/webkit/cwebview.cpp | 1 + gb.qt4/src/webkit/main.cpp | 2 +- gb.sdl.sound/src/main.c | 2 +- gb.sdl/src/main.cpp | 2 +- gb.xml/src/main.c | 2 +- gb.xml/src/xslt/main.c | 4 +- main/gbx/gbx_component.c | 35 ++++++++++-- main/gbx/gbx_component.h | 3 +- main/gbx/gbx_library.c | 12 +++-- main/gbx/gbx_library.h | 2 +- main/lib/debug/main.c | 2 +- main/lib/draw/cpaint.c | 2 +- main/lib/eval/main.c | 2 +- main/lib/gui/main.c | 2 +- main/lib/image/main.c | 2 +- 61 files changed, 230 insertions(+), 152 deletions(-) diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot index 10e57144b..01264f4bc 100644 --- a/app/src/gambas3/.lang/.pot +++ b/app/src/gambas3/.lang/.pot @@ -436,7 +436,7 @@ msgstr "" #: FConnectionEditor.class:261 FCreateFile.class:885 FDebugInfo.class:490 #: FEditor.class:2132 FFindList.class:195 FFind.class:114 #: FFontChooser.class:86 FForm.class:2836 FGotoLine.class:63 -#: FHelpBrowser.class:285 FIconEditor.class:1393 FImportTable.class:38 +#: FHelpBrowser.class:270 FIconEditor.class:1393 FImportTable.class:38 #: FList.class:155 FMain.class:204 FMakeExecutable.class:144 #: FMakeInstall.class:309 FMenu.class:1128 FNewConnection.class:317 #: FNewTable.class:168 FNewTranslation.class:70 FOpenProject.class:146 @@ -638,7 +638,7 @@ msgstr "" msgid "Default value" msgstr "" -#: FConnectionEditor.class:58 FDebugExpr.class:425 FHelpBrowser.class:257 +#: FConnectionEditor.class:58 FDebugExpr.class:425 FHelpBrowser.class:242 msgid "Index" msgstr "" @@ -781,7 +781,7 @@ msgid "Connection editor" msgstr "" #: FConnectionEditor.class:1547 FEditor.class:2132 FForm.class:2836 -#: FHelpBrowser.class:292 FIconEditor.class:2032 FTextEditor.class:462 +#: FHelpBrowser.class:277 FIconEditor.class:2032 FTextEditor.class:462 #: FTranslate.class:700 msgid "Reload" msgstr "" @@ -1229,7 +1229,7 @@ msgstr "" msgid "Find definition" msgstr "" -#: FEditor.class:3148 FHelpBrowser.class:271 +#: FEditor.class:3148 FHelpBrowser.class:256 msgid "Go back" msgstr "" @@ -1608,31 +1608,31 @@ msgstr "" msgid "Go to line" msgstr "" -#: FHelpBrowser.class:245 +#: FHelpBrowser.class:230 msgid "Help browser" msgstr "" -#: FHelpBrowser.class:278 +#: FHelpBrowser.class:263 msgid "Go forward" msgstr "" -#: FHelpBrowser.class:311 FIconEditor.class:2225 +#: FHelpBrowser.class:296 FIconEditor.class:2225 msgid "Zoom in" msgstr "" -#: FHelpBrowser.class:318 FIconEditor.class:2234 +#: FHelpBrowser.class:303 FIconEditor.class:2234 msgid "Zoom out" msgstr "" -#: FHelpBrowser.class:325 +#: FHelpBrowser.class:310 msgid "No zoom" msgstr "" -#: FHelpBrowser.class:337 +#: FHelpBrowser.class:322 msgid "Modify documentation..." msgstr "" -#: FHelpBrowser.class:345 +#: FHelpBrowser.class:329 msgid "Print" msgstr "" diff --git a/app/src/gambas3/.src/Help/FHelpBrowser.class b/app/src/gambas3/.src/Help/FHelpBrowser.class index 4f5959cca..916b58073 100644 --- a/app/src/gambas3/.src/Help/FHelpBrowser.class +++ b/app/src/gambas3/.src/Help/FHelpBrowser.class @@ -191,22 +191,7 @@ Public Sub btnPrint_Click() Printer1.OutputFile = "~/print.pdf" $bPrint = False - Printer1.Run - If $bPrint Then webHelp.Current.Print(Printer1) - 'Printer1.Run + If Printer1.Configure() Then Return + webHelp.Current.Print(Printer1) End - -Public Sub Printer1_Begin() - - $bPrint = True - Printer1.Cancel - -End - - -Public Sub Printer1_Draw() - - Debug - -End diff --git a/app/src/gambas3/.src/Help/FHelpBrowser.form b/app/src/gambas3/.src/Help/FHelpBrowser.form index 44cf8d3b8..1e36f2a90 100644 --- a/app/src/gambas3/.src/Help/FHelpBrowser.form +++ b/app/src/gambas3/.src/Help/FHelpBrowser.form @@ -86,7 +86,6 @@ } { btnPrint ToolButton MoveScaled(71,0,15,4) - Visible = False AutoResize = True Text = ("Print") Picture = Picture["icon:/small/print"] diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module index 2a7929b91..9982967dd 100644 --- a/app/src/gambas3/.src/Project.module +++ b/app/src/gambas3/.src/Project.module @@ -4492,7 +4492,7 @@ Public Sub MakeDirectoryIcon(Optional sDir As String) If sIcon Then Try hIcon = StretchIcon(sIcon, 16) - If hIcon Then hDirIcon.Draw(hIcon, 26, 47) + If hIcon Then hDirIcon.Draw(hIcon, 40, 34) Endif hDirIcon.Save(sDir &/ ".icon.png") diff --git a/app/src/gambas3/img/logo/gambas-folder-64.png b/app/src/gambas3/img/logo/gambas-folder-64.png index f66c374b92a4481211129149447c40632bb815cb..aa6e597a2c3191c610e74d4e821d3978ec318949 100644 GIT binary patch delta 3681 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 literal 6785 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 literal 7008 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 - gtk_container_resize_children(GTK_CONTAINER(gtk_widget_get_parent(gtk_widget_get_parent(widget)))); + //gtk_container_resize_children(GTK_CONTAINER(gtk_widget_get_parent(gtk_widget_get_parent(widget)))); } else { diff --git a/gb.gtk/src/main.cpp b/gb.gtk/src/main.cpp index 7687fddc3..e64129f0b 100644 --- a/gb.gtk/src/main.cpp +++ b/gb.gtk/src/main.cpp @@ -259,7 +259,7 @@ extern "C" CLASS_Image = GB.FindClass("Image"); CLASS_SvgImage = GB.FindClass("SvgImage"); - return TRUE; + return -1; } void EXPORT GB_EXIT() diff --git a/gb.gtk/src/opengl/main.cpp b/gb.gtk/src/opengl/main.cpp index 7f2c27bf3..1c3f2e6f2 100644 --- a/gb.gtk/src/opengl/main.cpp +++ b/gb.gtk/src/opengl/main.cpp @@ -47,7 +47,7 @@ int EXPORT GB_INIT(void) GB.GetInterface("gb.gtk", GTK_INTERFACE_VERSION, >K); GB.GetInterface("gb.opengl", GL_INTERFACE_VERSION, &GL); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.image.imlib/src/main.c b/gb.image.imlib/src/main.c index b1acbb715..dceef95ad 100644 --- a/gb.image.imlib/src/main.c +++ b/gb.image.imlib/src/main.c @@ -38,7 +38,7 @@ int EXPORT GB_INIT(void) { GB.GetInterface("gb.image", IMAGE_INTERFACE_VERSION, &IMAGE); imlib_set_cache_size(0); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.image.io/src/main.c b/gb.image.io/src/main.c index 4ef804c20..152c78c1b 100644 --- a/gb.image.io/src/main.c +++ b/gb.image.io/src/main.c @@ -41,7 +41,7 @@ int EXPORT GB_INIT(void) // Bug in the gdk-pixbuf documentation: the following is mandatory. g_type_init(); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.opengl/src/glsl/main.c b/gb.opengl/src/glsl/main.c index a7e66acfd..d54681afa 100644 --- a/gb.opengl/src/glsl/main.c +++ b/gb.opengl/src/glsl/main.c @@ -39,7 +39,7 @@ GB_DESC *GB_CLASSES[] EXPORT = int EXPORT GB_INIT(void) { - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.opengl/src/main.c b/gb.opengl/src/main.c index ebe344eef..1deafb24f 100644 --- a/gb.opengl/src/main.c +++ b/gb.opengl/src/main.c @@ -86,7 +86,7 @@ int EXPORT GB_INIT(void) { GB.GetInterface("gb.image", IMAGE_INTERFACE_VERSION, &IMAGE); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.qt.kde/src/html/main.cpp b/gb.qt.kde/src/html/main.cpp index 6f0703bdd..d5f4ddf67 100644 --- a/gb.qt.kde/src/html/main.cpp +++ b/gb.qt.kde/src/html/main.cpp @@ -41,7 +41,7 @@ int EXPORT GB_INIT(void) { GB.GetInterface("gb.qt", QT_INTERFACE_VERSION, &QT); - return TRUE; + return -1; } void EXPORT GB_EXIT() diff --git a/gb.qt.kde/src/main.cpp b/gb.qt.kde/src/main.cpp index afbf79355..556ca7d81 100644 --- a/gb.qt.kde/src/main.cpp +++ b/gb.qt.kde/src/main.cpp @@ -239,7 +239,7 @@ int EXPORT GB_INIT(void) GB.Hook(GB_HOOK_MAIN, (void *)hook_main); old_hook_lang = GB.Hook(GB_HOOK_LANG, (void *)hook_lang); - return TRUE; + return -1; } void EXPORT GB_EXIT() diff --git a/gb.qt/share/gb.form.arrangement.h b/gb.qt/share/gb.form.arrangement.h index 5fb1e47f5..8086e782a 100644 --- a/gb.qt/share/gb.form.arrangement.h +++ b/gb.qt/share/gb.form.arrangement.h @@ -217,7 +217,7 @@ void FUNCTION_NAME(void *_object) //(QFrame *cont) wc -= padding * 2; hc -= padding * 2; - //if (!strcmp(GET_OBJECT_NAME(_object), "HBox1")) + //if (!strcmp(GET_OBJECT_NAME(_object), "TabStrip1")) // fprintf(stderr, "#0: %d %d %d %d\n", xc, yc, wc, hc); if (indent) diff --git a/gb.qt/src/ext/main.cpp b/gb.qt/src/ext/main.cpp index 9976b0f0b..ff50f71a7 100644 --- a/gb.qt/src/ext/main.cpp +++ b/gb.qt/src/ext/main.cpp @@ -82,7 +82,7 @@ int EXPORT GB_INIT(void) GB.GetInterface("gb.qt", QT_INTERFACE_VERSION, &QT); DRAW_init(); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.qt/src/main.cpp b/gb.qt/src/main.cpp index 75a5e6dad..13295a37a 100644 --- a/gb.qt/src/main.cpp +++ b/gb.qt/src/main.cpp @@ -925,7 +925,7 @@ int EXPORT GB_INIT(void) QT_InitEventLoop(); - return TRUE; + return -1; } void EXPORT GB_EXIT() diff --git a/gb.qt/src/opengl/main.cpp b/gb.qt/src/opengl/main.cpp index d96fc52b7..de1a7e9c1 100644 --- a/gb.qt/src/opengl/main.cpp +++ b/gb.qt/src/opengl/main.cpp @@ -45,7 +45,7 @@ int EXPORT GB_INIT(void) GB.GetInterface("gb.qt", QT_INTERFACE_VERSION, &QT); GB.GetInterface("gb.opengl", GL_INTERFACE_VERSION, &GL); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.qt4/src/CContainer.cpp b/gb.qt4/src/CContainer.cpp index fc73d4df0..8d683570b 100755 --- a/gb.qt4/src/CContainer.cpp +++ b/gb.qt4/src/CContainer.cpp @@ -38,6 +38,7 @@ #include "CWindow.h" #include "CConst.h" #include "CScrollView.h" +#include "CTabStrip.h" #include "CColor.h" #include "CContainer.h" @@ -204,7 +205,22 @@ static void flush_cache() _cache.clear(); } +#else +#if 0 +static void get_widget_contents(QWidget *wid, int &x, int &y, int &w, int &h) +{ + QRect wc; + + wc = wid->contentsRect(); + + x = wc.x(); + y = wc.y(); + w = wc.width(); + h = wc.height(); + +} +#endif #endif static void resize_container(void *_object, QWidget *cont, int w, int h) @@ -249,6 +265,7 @@ static void resize_container(void *_object, QWidget *cont, int w, int h) #else +//#define GET_WIDGET_CONTENTS(_widget, _x, _y, _w, _h) get_widget_contents(_widget, _x, _y, _w, _h) #define GET_WIDGET_CONTENTS(_widget, _x, _y, _w, _h) \ _x = (_widget)->contentsRect().x(); \ _y = (_widget)->contentsRect().y(); \ @@ -276,6 +293,8 @@ static void resize_container(void *_object, QWidget *cont, int w, int h) #define GET_OBJECT_FROM_WIDGET(_widget) CWidget::getRealExisting(_widget) +#define GET_OBJECT_NAME(_object) (((CWIDGET *)_object)->name) + #define RAISE_ARRANGE_EVENT(_object) \ { \ GB.Raise(_object, EVENT_Arrange, 0); \ @@ -296,6 +315,8 @@ void CCONTAINER_arrange(void *_object) { if (GB.Is(THIS, CLASS_ScrollView)) CSCROLLVIEW_arrange(THIS); + else if (GB.Is(THIS, CLASS_TabStrip)) + CTABSTRIP_arrange(THIS); #if DEBUG_CONTAINER static int level = 0; @@ -452,9 +473,12 @@ void MyContainer::showEvent(QShowEvent *e) void *_object = CWidget::get(this); QWidget::showEvent(e); THIS->widget.flag.shown = TRUE; + // if (!qstrcmp(GB.GetClassName(THIS), "TabStrip")) + // { + // qDebug("MyContainer::showEvent: %s %p: SHOWN = 1 (%d %d)", THIS->widget.name, THIS, THIS->widget.widget->isVisible() , !THIS->widget.widget->isHidden()); + // BREAKPOINT(); + // } CCONTAINER_arrange(THIS); - //if (!qstrcmp(GB.GetClassName(THIS), "ListContainer")) - // qDebug("MyContainer::showEvent: %s %p: SHOWN = 1 (%d %d)", THIS->widget.name, THIS, THIS->widget.widget->isVisible() , !THIS->widget.widget->isHidden()); } void MyContainer::hideEvent(QHideEvent *e) diff --git a/gb.qt4/src/CTabStrip.cpp b/gb.qt4/src/CTabStrip.cpp index e003eaa57..058f2b363 100644 --- a/gb.qt4/src/CTabStrip.cpp +++ b/gb.qt4/src/CTabStrip.cpp @@ -42,6 +42,11 @@ DECLARE_METHOD(CCONTAINER_y); DECLARE_EVENT(EVENT_Click); +void CTABSTRIP_arrange(void *_object) +{ + WIDGET->forceLayout(); +} + /** CTab *****************************************************************/ class CTab @@ -335,7 +340,6 @@ BEGIN_METHOD(CTABSTRIP_new, GB_OBJECT parent) CWIDGET_new(wid, (void *)_object, true); set_tab_count(THIS, 1); - wid->show(); //wid->updateLayout(); @@ -726,15 +730,13 @@ void CTabStrip::currentChanged(int index) wid = WIDGET->currentWidget(); - //qDebug("CTabStrip::currentChanged: %d %p -> %p", index, THIS->container, wid); - if (wid != THIS->container) { + //qDebug("CTabStrip::currentChanged: %d %p -> %p", index, THIS->container, wid); if (THIS->container) THIS->container->hide(); THIS->container = wid; wid->show(); - WIDGET->forceLayout(); CCONTAINER_arrange(THIS); //if (wid->isVisible() && !THIS->lock) @@ -789,14 +791,12 @@ GB_DESC CTabStripDesc[] = GB_PROPERTY("Orientation", "i", CTABSTRIP_orientation), GB_PROPERTY("Enabled", "b", CTABSTRIP_enabled), - #ifdef GB_QT_COMPONENT GB_PROPERTY_READ("ClientX", "i", CTABSTRIP_client_x), GB_PROPERTY_READ("ClientY", "i", CTABSTRIP_client_y), GB_PROPERTY_READ("ClientW", "i", CTABSTRIP_client_width), GB_PROPERTY_READ("ClientWidth", "i", CTABSTRIP_client_width), GB_PROPERTY_READ("ClientH", "i", CTABSTRIP_client_height), GB_PROPERTY_READ("ClientHeight", "i", CTABSTRIP_client_height), - #endif GB_PROPERTY("Arrangement", "i", CCONTAINER_arrangement), GB_PROPERTY("AutoResize", "b", CCONTAINER_auto_resize), diff --git a/gb.qt4/src/CTabStrip.h b/gb.qt4/src/CTabStrip.h index b8d512a7f..88aee8a76 100644 --- a/gb.qt4/src/CTabStrip.h +++ b/gb.qt4/src/CTabStrip.h @@ -99,4 +99,6 @@ public slots: void currentChanged(int); }; +void CTABSTRIP_arrange(void *_object); + #endif diff --git a/gb.qt4/src/CWidget.cpp b/gb.qt4/src/CWidget.cpp index 0597e17df..470eadeba 100644 --- a/gb.qt4/src/CWidget.cpp +++ b/gb.qt4/src/CWidget.cpp @@ -263,7 +263,7 @@ void CWIDGET_new(QWidget *w, void *_object, bool no_show, bool no_filter, bool n if (!no_show) { - w->setGeometry(-16, -16, 16, 16); + w->setGeometry(-32, -32, 32, 32); CWIDGET_set_visible(THIS, true); w->raise(); } diff --git a/gb.qt4/src/cpaint_impl.cpp b/gb.qt4/src/cpaint_impl.cpp index da326f246..f752e8af1 100644 --- a/gb.qt4/src/cpaint_impl.cpp +++ b/gb.qt4/src/cpaint_impl.cpp @@ -318,23 +318,26 @@ static void Stroke(GB_PAINT *d, int preserve) { CHECK_PATH(d); - if (!CLIP(d)) - PAINTER(d)->strokePath(*PATH(d), PAINTER(d)->pen()); - else + if (PAINTER(d)->pen().widthF() > 0.0) { - QPainterPathStroker stroker; - QPen pen = PAINTER(d)->pen(); - - stroker.setCapStyle(pen.capStyle()); - stroker.setDashOffset(pen.dashOffset()); - stroker.setDashPattern(pen.dashPattern()); - stroker.setJoinStyle(pen.joinStyle()); - stroker.setMiterLimit(pen.miterLimit()); - stroker.setWidth(pen.widthF()); - - QPainterPath path = PAINTER(d)->worldTransform().inverted().map(*CLIP(d)); - path = path.intersected(stroker.createStroke(*PATH(d))); - PAINTER(d)->fillPath(path, PAINTER(d)->brush()); + if (!CLIP(d)) + PAINTER(d)->strokePath(*PATH(d), PAINTER(d)->pen()); + else + { + QPainterPathStroker stroker; + QPen pen = PAINTER(d)->pen(); + + stroker.setCapStyle(pen.capStyle()); + stroker.setDashOffset(pen.dashOffset()); + stroker.setDashPattern(pen.dashPattern()); + stroker.setJoinStyle(pen.joinStyle()); + stroker.setMiterLimit(pen.miterLimit()); + stroker.setWidth(pen.widthF()); + + QPainterPath path = PAINTER(d)->worldTransform().inverted().map(*CLIP(d)); + path = path.intersected(stroker.createStroke(*PATH(d))); + PAINTER(d)->fillPath(path, PAINTER(d)->brush()); + } } PRESERVE_PATH(d, preserve); diff --git a/gb.qt4/src/ext/main.cpp b/gb.qt4/src/ext/main.cpp index b7ca1fa18..83598fbd3 100644 --- a/gb.qt4/src/ext/main.cpp +++ b/gb.qt4/src/ext/main.cpp @@ -79,7 +79,7 @@ int EXPORT GB_INIT(void) GB.GetInterface("gb.qt4", QT_INTERFACE_VERSION, &QT); DRAW_init(); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.qt4/src/main.cpp b/gb.qt4/src/main.cpp index cd3774830..b37f4f4b9 100644 --- a/gb.qt4/src/main.cpp +++ b/gb.qt4/src/main.cpp @@ -129,6 +129,7 @@ GB_CLASS CLASS_Control; GB_CLASS CLASS_Container; GB_CLASS CLASS_UserControl; GB_CLASS CLASS_UserContainer; +GB_CLASS CLASS_TabStrip; GB_CLASS CLASS_Window; GB_CLASS CLASS_Menu; GB_CLASS CLASS_Picture; @@ -1025,6 +1026,7 @@ int EXPORT GB_INIT(void) CLASS_Container = GB.FindClass("Container"); CLASS_UserControl = GB.FindClass("UserControl"); CLASS_UserContainer = GB.FindClass("UserContainer"); + CLASS_TabStrip = GB.FindClass("TabStrip"); CLASS_Window = GB.FindClass("Window"); CLASS_Menu = GB.FindClass("Menu"); CLASS_Picture = GB.FindClass("Picture"); @@ -1037,7 +1039,7 @@ int EXPORT GB_INIT(void) QT_InitEventLoop(); - return TRUE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.qt4/src/main.h b/gb.qt4/src/main.h index 6d9bfff80..14da408bd 100644 --- a/gb.qt4/src/main.h +++ b/gb.qt4/src/main.h @@ -49,6 +49,7 @@ extern GB_CLASS CLASS_Control; extern GB_CLASS CLASS_Container; extern GB_CLASS CLASS_UserControl; extern GB_CLASS CLASS_UserContainer; +extern GB_CLASS CLASS_TabStrip; extern GB_CLASS CLASS_Window; extern GB_CLASS CLASS_Menu; extern GB_CLASS CLASS_Picture; diff --git a/gb.qt4/src/opengl/main.cpp b/gb.qt4/src/opengl/main.cpp index 05cdc5795..0ea0e4155 100644 --- a/gb.qt4/src/opengl/main.cpp +++ b/gb.qt4/src/opengl/main.cpp @@ -43,7 +43,7 @@ int EXPORT GB_INIT(void) GB.GetInterface("gb.qt4", QT_INTERFACE_VERSION, &QT); GB.GetInterface("gb.opengl", GL_INTERFACE_VERSION, &GL); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.qt4/src/webkit/cwebview.cpp b/gb.qt4/src/webkit/cwebview.cpp index 270025436..f832cf63e 100644 --- a/gb.qt4/src/webkit/cwebview.cpp +++ b/gb.qt4/src/webkit/cwebview.cpp @@ -362,6 +362,7 @@ GB_DESC CWebViewDesc[] = MyWebView::MyWebView(QWidget *parent) : QWebView(parent) { + //settings()->setFontFamily(QWebSettings::FixedFont, "monospace"); } QWebView *MyWebView::createWindow(QWebPage::WebWindowType type) diff --git a/gb.qt4/src/webkit/main.cpp b/gb.qt4/src/webkit/main.cpp index 122188abc..90d662504 100644 --- a/gb.qt4/src/webkit/main.cpp +++ b/gb.qt4/src/webkit/main.cpp @@ -54,7 +54,7 @@ GB_DESC *GB_CLASSES[] EXPORT = int EXPORT GB_INIT(void) { GB.GetInterface("gb.qt4", QT_INTERFACE_VERSION, &QT); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/gb.sdl.sound/src/main.c b/gb.sdl.sound/src/main.c index da7c31106..97edad224 100644 --- a/gb.sdl.sound/src/main.c +++ b/gb.sdl.sound/src/main.c @@ -74,7 +74,7 @@ int EXPORT GB_INIT(void) SOUND_init(); - return 1; + return -1; } diff --git a/gb.sdl/src/main.cpp b/gb.sdl/src/main.cpp index 1dab1aa88..aa4fb24a0 100644 --- a/gb.sdl/src/main.cpp +++ b/gb.sdl/src/main.cpp @@ -88,7 +88,7 @@ extern "C" CLASS_Image = GB.FindClass("Image"); CLASS_Font = GB.FindClass("Font"); - return true; + return -1; } void EXPORT GB_EXIT() diff --git a/gb.xml/src/main.c b/gb.xml/src/main.c index 6f656d1e4..4af341b53 100644 --- a/gb.xml/src/main.c +++ b/gb.xml/src/main.c @@ -58,7 +58,7 @@ GB_DESC *GB_CLASSES[] EXPORT = int EXPORT GB_INIT(void) { - return 1; + return -1; } void EXPORT GB_EXIT() diff --git a/gb.xml/src/xslt/main.c b/gb.xml/src/xslt/main.c index a5b62bc17..9559da0ae 100644 --- a/gb.xml/src/xslt/main.c +++ b/gb.xml/src/xslt/main.c @@ -32,16 +32,14 @@ GB_INTERFACE GB EXPORT; GB_DESC *GB_CLASSES[] EXPORT = { - CXsltDesc, - NULL }; int EXPORT GB_INIT(void) { - return 1; + return -1; } void EXPORT GB_EXIT() diff --git a/main/gbx/gbx_component.c b/main/gbx/gbx_component.c index e4f38c7a1..d29a26626 100644 --- a/main/gbx/gbx_component.c +++ b/main/gbx/gbx_component.c @@ -54,7 +54,7 @@ #include "gbx_component.h" -/*#define DEBUG*/ +//#define DEBUG_COMP /*#define DEBUG_PRELOAD*/ COMPONENT *COMPONENT_current = NULL; @@ -76,9 +76,29 @@ void COMPONENT_init(void) void COMPONENT_exit(void) { COMPONENT *comp; + int order; + int max_order = 0; LIST_for_each(comp, _component_list) - COMPONENT_unload(comp); + { + if (comp->order > max_order) + max_order = comp->order; + } + + for (order = 0; order <= max_order; order++) + { + LIST_for_each(comp, _component_list) + { + if (comp->order == order) + COMPONENT_unload(comp); + } + } + + LIST_for_each(comp, _component_list) + { + if (comp->loaded) + COMPONENT_unload(comp); + } while (_component_list) COMPONENT_delete(_component_list); @@ -245,7 +265,7 @@ void COMPONENT_load(COMPONENT *comp) COMPONENT_current = comp; if (comp->library) - LIBRARY_load(comp->library); + comp->order = LIBRARY_load(comp->library); if (comp->archive) ARCHIVE_load(comp->archive); @@ -256,12 +276,21 @@ void COMPONENT_load(COMPONENT *comp) void COMPONENT_unload(COMPONENT *comp) { + if (!comp->loaded) + return; + + #if DEBUG_COMP + fprintf(stderr, "Unloading component %s [%d]\n", comp->name, comp->order); + #endif + if (comp->library) LIBRARY_unload(comp->library); /* Do not exist yet */ //if (comp->archive) // ARCHIVE_unload(comp->archive); + + comp->loaded = FALSE; } diff --git a/main/gbx/gbx_component.h b/main/gbx/gbx_component.h index 3e78c20f2..aec5e8946 100644 --- a/main/gbx/gbx_component.h +++ b/main/gbx/gbx_component.h @@ -38,11 +38,12 @@ typedef char *name; LIBRARY *library; ARCHIVE *archive; + char order; unsigned preload : 1; unsigned loaded : 1; unsigned user : 1; unsigned warning : 1; // Set when the bytecode warning was displayed by the class loader for this component - unsigned _reserved : 28; + unsigned _reserved : 20; } PACKED COMPONENT; diff --git a/main/gbx/gbx_library.c b/main/gbx/gbx_library.c index d076d418b..281a976f7 100644 --- a/main/gbx/gbx_library.c +++ b/main/gbx/gbx_library.c @@ -438,15 +438,16 @@ void LIBRARY_delete(LIBRARY *lib) } -void LIBRARY_load(LIBRARY *lib) +int LIBRARY_load(LIBRARY *lib) { int (*func)(); void **iface; GB_DESC **desc; char *path; + int order = 0; if (lib->handle) - return; + return 0; #ifdef DEBUG clock_t t = clock(); @@ -489,8 +490,9 @@ void LIBRARY_load(LIBRARY *lib) lib->info = (int(*)())get_symbol(lib, LIB_INFO, FALSE); /* Initialisation */ - lib->persistent = (bool)(*func)(); - + order = (*func)(); + lib->persistent = order < 0; + /* Déclaration des classes */ desc = get_symbol(lib, LIB_CLASS, FALSE); if (desc) @@ -500,6 +502,8 @@ void LIBRARY_load(LIBRARY *lib) fprintf(stderr, "Library %s loaded ", lib->name); fprintf(stderr, "in %g s\n", ((double)(clock() - t) / CLOCKS_PER_SEC)); #endif + + return order; } diff --git a/main/gbx/gbx_library.h b/main/gbx/gbx_library.h index fa7f2ed89..b7c09cb25 100644 --- a/main/gbx/gbx_library.h +++ b/main/gbx/gbx_library.h @@ -64,7 +64,7 @@ void LIBRARY_exit(void); LIBRARY *LIBRARY_create(const char *path); void LIBRARY_delete(LIBRARY *lib); -void LIBRARY_load(LIBRARY *lib); +int LIBRARY_load(LIBRARY *lib); void LIBRARY_unload(LIBRARY *lib); void LIBRARY_declare(GB_DESC **desc); diff --git a/main/lib/debug/main.c b/main/lib/debug/main.c index 7f08cb449..903de0198 100644 --- a/main/lib/debug/main.c +++ b/main/lib/debug/main.c @@ -54,7 +54,7 @@ void *GB_DEBUG_1[] EXPORT = int EXPORT GB_INIT(void) { - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/main/lib/draw/cpaint.c b/main/lib/draw/cpaint.c index 6d19e8e7f..3e3cf1d25 100644 --- a/main/lib/draw/cpaint.c +++ b/main/lib/draw/cpaint.c @@ -694,7 +694,7 @@ BEGIN_METHOD(Paint_Image, GB_OBJECT image; GB_FLOAT x; GB_FLOAT y) { GB_TRANSFORM transform; PAINT->Transform.Create(&transform); - PAINT->Transform.Translate(transform, -VARGOPT(x, 0.0), -VARGOPT(y, 0.0)); + PAINT->Transform.Translate(transform, VARGOPT(x, 0.0), VARGOPT(y, 0.0)); PAINT->Brush.Matrix(brush, TRUE, transform); PAINT->Transform.Delete(&transform); } diff --git a/main/lib/eval/main.c b/main/lib/eval/main.c index 920f6000c..f11d5ea40 100644 --- a/main/lib/eval/main.c +++ b/main/lib/eval/main.c @@ -65,7 +65,7 @@ int EXPORT GB_INIT(void) { EVAL_init(); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/main/lib/gui/main.c b/main/lib/gui/main.c index 3e417b6c5..e620d14c3 100644 --- a/main/lib/gui/main.c +++ b/main/lib/gui/main.c @@ -64,7 +64,7 @@ int EXPORT GB_INIT(void) if (GB.LoadComponent(comp)) fprintf(stderr, "gb.gui: unable to load '%s' component\n", comp); - return FALSE; + return 0; } void EXPORT GB_EXIT() diff --git a/main/lib/image/main.c b/main/lib/image/main.c index 1f2724fc5..f6ccd1ab1 100644 --- a/main/lib/image/main.c +++ b/main/lib/image/main.c @@ -71,7 +71,7 @@ void *GB_IMAGE_1[] EXPORT = int EXPORT GB_INIT(void) { - return FALSE; + return 0; } void EXPORT GB_EXIT()