diff --git a/examples/examples/Database/PictureDatabase/.icon.png b/examples/examples/Database/PictureDatabase/.icon.png index 9170916d2..51eecdab8 100644 Binary files a/examples/examples/Database/PictureDatabase/.icon.png and b/examples/examples/Database/PictureDatabase/.icon.png differ diff --git a/examples/examples/Database/PictureDatabase/.project b/examples/examples/Database/PictureDatabase/.project index cd02b7531..c62451beb 100644 --- a/examples/examples/Database/PictureDatabase/.project +++ b/examples/examples/Database/PictureDatabase/.project @@ -1,5 +1,5 @@ # Gambas Project File 3.0 -# Compiled with Gambas 2.99.0 (r2045) +# Compiled with Gambas 2.99.0 (r2435) Title=Picture Database Viewer Startup=FormPictureDatabase Icon=Images/image-x-generic.png @@ -7,7 +7,7 @@ Version=0.0.2 Component=gb.gui Component=gb.db Authors="Timothy Marshal-Nichols\ntimothy.marshal-nichols@ntlworld.com" -Environment="GB_GUI=gb.qt" +Environment="GB_GUI=gb.gtk" TabSize=2 Translate=1 Language=fr diff --git a/examples/examples/Database/PictureDatabase/.src/FormPictureDatabase.class b/examples/examples/Database/PictureDatabase/.src/FormPictureDatabase.class index b64e5fbb9..311950e7a 100644 --- a/examples/examples/Database/PictureDatabase/.src/FormPictureDatabase.class +++ b/examples/examples/Database/PictureDatabase/.src/FormPictureDatabase.class @@ -204,7 +204,7 @@ End Private Function FileFilter(Optional All As Boolean = False) As String[] Dim filter As New String[] If All Then - filter.Add("*.png *.jpeg *.jpg *.bmp *.gif *.xpm") + filter.Add("*.png;*.jpeg;*.jpg;*.bmp;*.gif;*.xpm") filter.Add("All Graphics") End If filter.Add("*.png") diff --git a/gb.gtk/src/gsplitter.cpp b/gb.gtk/src/gsplitter.cpp index 23fc03d9e..76b73bc41 100644 --- a/gb.gtk/src/gsplitter.cpp +++ b/gb.gtk/src/gsplitter.cpp @@ -140,7 +140,7 @@ gSplitter::gSplitter(gContainer *parent, bool vert) : gContainer(parent) g_signal_connect_after(G_OBJECT(curr), "size-allocate", G_CALLBACK(cb_size_allocate), (gpointer)this); } -void gSplitter::insert(gControl *child) +void gSplitter::insert(gControl *child, bool realize) { GtkWidget *w = child->border; GtkWidget *tmp; @@ -172,7 +172,7 @@ void gSplitter::insert(gControl *child) unlock(); - gContainer::insert(child); + gContainer::insert(child, realize); //updateVisibility(); //emit(SIGNAL(onResize)); diff --git a/gb.gtk/src/gsplitter.h b/gb.gtk/src/gsplitter.h index eff3942a5..722b9f382 100644 --- a/gb.gtk/src/gsplitter.h +++ b/gb.gtk/src/gsplitter.h @@ -43,7 +43,7 @@ public: void (*onResize)(gControl *sender); //"Private" - virtual void insert(gControl *child); + virtual void insert(gControl *child, bool realize = false); virtual void remove(gControl *child); void updateChild(GtkWidget *wid = 0); void updateVisibility(); diff --git a/gb.qt/src/CDialog.cpp b/gb.qt/src/CDialog.cpp index 320b006a0..bda71389b 100644 --- a/gb.qt/src/CDialog.cpp +++ b/gb.qt/src/CDialog.cpp @@ -60,7 +60,7 @@ static QString get_filter(void) if (s.length()) s += ";;"; s += TO_QSTRING(*((char **)GB.Array.Get(dialog_filter, i * 2 + 1))); - s += " (" + filter + ")"; + s += " (" + filter.replace(";", " ") + ")"; } s += ";;"; diff --git a/gb.qt4/src/CDialog.cpp b/gb.qt4/src/CDialog.cpp index c3bd5431e..05f3df2d9 100644 --- a/gb.qt4/src/CDialog.cpp +++ b/gb.qt4/src/CDialog.cpp @@ -60,7 +60,7 @@ static QString get_filter(void) if (s.length()) s += ";;"; s += TO_QSTRING(*((char **)GB.Array.Get(dialog_filter, i * 2 + 1))); - s += " (" + filter + ")"; + s += " (" + filter.replace(";", " ") + ")"; } s += ";;";