diff --git a/app/src/gambas3/.src/Editor/Form/FForm.class b/app/src/gambas3/.src/Editor/Form/FForm.class index f7580265e..4527011e7 100644 --- a/app/src/gambas3/.src/Editor/Form/FForm.class +++ b/app/src/gambas3/.src/Editor/Form/FForm.class @@ -4335,7 +4335,7 @@ Public Sub dwgInfo_Draw() If Not $cInfo Then Return - iCol = Color.SetAlpha(Color.TooltipBackground, 128) + iCol = Color.SetAlpha(Color.TextForeground, 128) H = Paint.Font.Height + DS Paint.FillRect(0, 0, Paint.W, H, iCol) diff --git a/app/src/gambas3/.src/Editor/Form/FForm.form b/app/src/gambas3/.src/Editor/Form/FForm.form index 821d59d2b..910c2b625 100644 --- a/app/src/gambas3/.src/Editor/Form/FForm.form +++ b/app/src/gambas3/.src/Editor/Form/FForm.form @@ -681,15 +681,15 @@ Background = Color.Background } } - { dwgInfo DrawingArea - MoveScaled(59,14,20,6) - Ignore = True - } { dwgBackground DrawingArea MoveScaled(76,26,12,9) Background = Color.LightForeground Ignore = True } + { dwgInfo DrawingArea + MoveScaled(65,45,20,6) + Ignore = True + } { timMoveInfo #Timer #MoveScaled(108,16) } diff --git a/app/src/gambas3/.src/Editor/Image/FImageEditor.class b/app/src/gambas3/.src/Editor/Image/FImageEditor.class index b3b680539..5b713ffe9 100644 --- a/app/src/gambas3/.src/Editor/Image/FImageEditor.class +++ b/app/src/gambas3/.src/Editor/Image/FImageEditor.class @@ -3159,7 +3159,7 @@ Public Sub dwgInfo_Draw() If Not $cInfo Then Return - iCol = Color.SetAlpha(Color.TooltipBackground, 128) + iCol = Color.SetAlpha(Color.TextForeground, 128) H = Paint.Font.Height + DS Paint.FillRect(0, 0, Paint.W, H, iCol) diff --git a/gb.gtk/src/gmainwindow.cpp b/gb.gtk/src/gmainwindow.cpp index 04c1aee18..29f9a0eb0 100644 --- a/gb.gtk/src/gmainwindow.cpp +++ b/gb.gtk/src/gmainwindow.cpp @@ -1429,7 +1429,11 @@ void gMainWindow::setUtility(bool v) // TODO: works only if the window is not mapped! _utility = v; +#if GTK_CHECK_VERSION(2, 20, 0) if (gtk_widget_get_mapped(border)) +#else + if (GTK_WIDGET_MAPPED(border)) +#endif { remap = true; gtk_widget_unmap(border); diff --git a/gb.qt4/src/CFont.cpp b/gb.qt4/src/CFont.cpp index 55f0d3503..c3fd1b9b5 100644 --- a/gb.qt4/src/CFont.cpp +++ b/gb.qt4/src/CFont.cpp @@ -133,7 +133,9 @@ static void set_font_from_string(CFONT *_object, QString &str) if (flag == "BOLD") { f.setBold(true); +#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) f.setStyleName("Bold"); +#endif } else if (flag == "ITALIC") f.setItalic(true); @@ -150,12 +152,14 @@ static void set_font_from_string(CFONT *_object, QString &str) f.setPointSizeF(SIZE_VIRTUAL_TO_REAL(size)); else if (elt.length()) { - f.setStyleName(""); f.setBold(false); f.setItalic(false); f.setUnderline(false); f.setStrikeOut(false); f.setFamily(elt); +#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) + f.setStyleName(""); +#endif } } }