diff --git a/Makefile.am b/Makefile.am index f00b70e42..86d15f81b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,35 @@ -SUBDIRS = main @bzlib2_dir@ @zlib_dir@ @mysql_dir@ @odbc_dir@ @postgresql_dir@ @sqlite3_dir@ @sqlite2_dir@ @firebird_dir@ @gtk_dir@ @net_dir@ @curl_dir@ @smtp_dir@ @pcre_dir@ @qt_dir@ @sdl_dir@ @sdlsound_dir@ @xml_dir@ @v4l_dir@ @crypt_dir@ @opengl_dir@ @corba_dir@ @pdf_dir@ @desktop_dir@ @qt4_dir@ @cairo_dir@ @imageio_dir@ @imageimlib_dir@ comp app examples +SUBDIRS = \ + main \ + @bzlib2_dir@ \ + @zlib_dir@ \ + @mysql_dir@ \ + @odbc_dir@ \ + @postgresql_dir@ \ + @sqlite2_dir@ \ + @sqlite3_dir@ \ + @firebird_dir@ \ + @net_dir@ \ + @curl_dir@ \ + @smtp_dir@ \ + @pcre_dir@ \ + @sdl_dir@ \ + @sdlsound_dir@ \ + @xml_dir@ \ + @v4l_dir@ \ + @crypt_dir@ \ + @corba_dir@ \ + @qt4_dir@ \ + @gtk_dir@ \ + @qt_dir@ \ + @opengl_dir@ \ + @desktop_dir@ \ + @pdf_dir@ \ + @cairo_dir@ \ + @imageio_dir@ \ + @imageimlib_dir@ \ + comp \ + app \ + examples EXTRA_DIST = component.am README README.*[^~] TODO TEMPLATE reconf reconf-all diff --git a/TODO b/TODO index 2fa990bf1..80b901577 100644 --- a/TODO +++ b/TODO @@ -83,6 +83,11 @@ DOCUMENTATION WIKI - Fix last changes: only those in one language. - A documentation page to explain the Gambas syntax. +NETWORK + +- HttpClient.Headers should be writable and used when posting. +- Is is possible to implement the HTTP PUT method? + COMPONENTS - State of gb.corba ? diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project index 1865331fe..e20ed8257 100644 --- a/comp/src/gb.form/.project +++ b/comp/src/gb.form/.project @@ -1,5 +1,5 @@ # Gambas Project File 3.0 -# Compiled with Gambas 2.99.0 (r2606) +# Compiled with Gambas 2.99.0 (r2622) Startup=FMain StackTrace=1 Version=2.99.0 diff --git a/comp/src/gb.form/.src/SidePanel/FSidePanel.class b/comp/src/gb.form/.src/SidePanel/FSidePanel.class index c7e7b83f5..e34525d34 100644 --- a/comp/src/gb.form/.src/SidePanel/FSidePanel.class +++ b/comp/src/gb.form/.src/SidePanel/FSidePanel.class @@ -5,6 +5,8 @@ Static Private $hHandleV As Picture Private $iOrientation As Integer Private $bFixed As Boolean +Private $X As Integer +Private $Y As Integer Private $W As Integer Private $H As Integer Private $bVisible As Boolean @@ -260,18 +262,24 @@ Private Sub RefreshAll() If $bVisible Then panSide.Show 'Enabled = TRUE - If $W And If $H Then Me.Parent.Resize($W, $H) + If $W And If $H Then Me.Parent.Move($X, $Y, $W, $H) Else 'DEBUG ME.Parent.W;; ME.CLientW panSide.Hide 'Enabled = FALSE Select Case $iOrientation - Case Align.Top, Align.Bottom + Case Align.Top Me.Parent.H = BUTTON_H - Case Else + Case Align.Bottom + Me.Parent.Y += Me.Parent.H - BUTTON_H + Me.Parent.H = BUTTON_H + Case Align.Left + Me.Parent.W = BUTTON_H + Case Align.Right + Me.Parent.X += Me.Parent.W - BUTTON_H Me.Parent.W = BUTTON_H End Select Endif - + RefreshArrow RefreshPanel @@ -285,9 +293,13 @@ Private Sub TogglePanel() If $bVisible Then GetParent()._Hide - - $W = Me.Parent.Width - $H = Me.Parent.Height + + With Me.Parent + $X = .X + $Y = .Y + $W = .Width + $H = .Height + End With $bVisible = False RefreshAll Action.Raise(Me.Parent) diff --git a/configure.ac b/configure.ac index 97f70f28c..7486c047e 100644 --- a/configure.ac +++ b/configure.ac @@ -17,22 +17,22 @@ GB_CONFIG_SUBDIRS(postgresql, gb.db.postgresql) GB_CONFIG_SUBDIRS(sqlite2, gb.db.sqlite2) GB_CONFIG_SUBDIRS(sqlite3, gb.db.sqlite3) GB_CONFIG_SUBDIRS(firebird, gb.db.firebird) -GB_CONFIG_SUBDIRS(gtk, gb.gtk) -GB_CONFIG_SUBDIRS(pdf, gb.pdf) GB_CONFIG_SUBDIRS(net, gb.net) GB_CONFIG_SUBDIRS(curl, gb.net.curl) GB_CONFIG_SUBDIRS(smtp, gb.net.smtp) GB_CONFIG_SUBDIRS(pcre, gb.pcre) -GB_CONFIG_SUBDIRS(qt, gb.qt) GB_CONFIG_SUBDIRS(sdl, gb.sdl) GB_CONFIG_SUBDIRS(sdlsound, gb.sdl.sound) GB_CONFIG_SUBDIRS(xml, gb.xml) GB_CONFIG_SUBDIRS(v4l, gb.v4l) GB_CONFIG_SUBDIRS(crypt, gb.crypt) -GB_CONFIG_SUBDIRS(opengl, gb.opengl) GB_CONFIG_SUBDIRS(corba, gb.corba) -GB_CONFIG_SUBDIRS(desktop, gb.desktop) GB_CONFIG_SUBDIRS(qt4, gb.qt4) +GB_CONFIG_SUBDIRS(gtk, gb.gtk) +GB_CONFIG_SUBDIRS(qt, gb.qt) +GB_CONFIG_SUBDIRS(opengl, gb.opengl) +GB_CONFIG_SUBDIRS(desktop, gb.desktop) +GB_CONFIG_SUBDIRS(pdf, gb.pdf) GB_CONFIG_SUBDIRS(cairo, gb.cairo) GB_CONFIG_SUBDIRS(imageio, gb.image.io) GB_CONFIG_SUBDIRS(imageimlib, gb.image.imlib) @@ -64,7 +64,7 @@ AC_OUTPUT(Makefile) GB_SUMMARY="" for comp in gb.*; do if test -e $comp/DISABLED; then - GB_SUMMARY="$GB_SUMMARY\n- $comp" + GB_SUMMARY="$GB_SUMMARY$'\n'- $comp" fi done diff --git a/gb.gtk/src/gmainwindow.cpp b/gb.gtk/src/gmainwindow.cpp index 9e401a32a..2eb2c035e 100644 --- a/gb.gtk/src/gmainwindow.cpp +++ b/gb.gtk/src/gmainwindow.cpp @@ -67,7 +67,9 @@ static void cb_hide (GtkWidget *widget, gMainWindow *data) static gboolean win_close(GtkWidget *widget,GdkEvent *event,gMainWindow *data) { - data->doClose(); + if (!gMainWindow::_current || data == gMainWindow::_current) + data->doClose(); + return true; } diff --git a/gb.qt4/src/main.cpp b/gb.qt4/src/main.cpp index 6b20f8827..e9acfe2da 100644 --- a/gb.qt4/src/main.cpp +++ b/gb.qt4/src/main.cpp @@ -49,7 +49,6 @@ #include #include #include -#include #include #include "gb.image.h" @@ -101,6 +100,7 @@ #include "cpaint_impl.h" #ifndef NO_X_WINDOW +#include #include "CEmbedder.h" #include "CTrayIcon.h" #include "x11.h" @@ -579,7 +579,7 @@ static void QT_InitEventLoop(void) { } -extern void qt_x11_set_global_double_buffer(bool); +//extern void qt_x11_set_global_double_buffer(bool); static void QT_Init(void) { diff --git a/main/gbx/gb_error.c b/main/gbx/gb_error.c index 868656ca7..a674a71b6 100644 --- a/main/gbx/gb_error.c +++ b/main/gbx/gb_error.c @@ -489,9 +489,20 @@ void ERROR_print_at(FILE *where, bool msgonly, bool newline) fprintf(where, "%ld:", ERROR_current->info.code);*/ if (ERROR_current->info.code > 0) fprintf(where, "#%d: ", ERROR_current->info.code); + fprintf(where, "%s", ERROR_current->info.msg); + } + else + { + char *p = ERROR_current->info.msg; + char c; + + while ((c = *p++)) + { + if (c == '\n') c = ' '; + fputc(c, where); + } } - fprintf(where, "%s", ERROR_current->info.msg); if (newline) fputc('\n', where); }