[Libreoffice-commits] .: 2 commits - configure.in vcl/inc vcl/unx

[Michael Meeks]

 configure.in                                  |    4 +++-
 vcl/inc/vcl/salbtype.hxx                      |    2 +-
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e53ac9984cd745736ec07d039ca92451732392a1
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Nov 3 19:48:25 2011 +0000

    gtk3: Check for gtk3 >= 3.2 - we need that for broadway anyway

diff --git a/configure.in b/configure.in
index d95dc7c..392cd15 100644
--- a/configure.in
+++ b/configure.in
@@ -6858,9 +6858,11 @@ if test "x$enable_gtk3" = "xyes"; then
     if test "$with_system_cairo" != yes; then
         echo "System cairo required for gtk3 support, please use --system-cairo"
     fi
-    PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+    PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
     if test "x$ENABLE_GTK3" = "xTRUE"; then
         R="gtk3"
+    else
+        AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
     fi
 fi
 AC_SUBST(GTK3_LIBS)
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 9e93a02..eb76ea7 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -109,7 +109,7 @@ static void PrepareComboboxStyle( GtkStyleContext *context,
         gtk_widget_path_append_with_siblings(path, siblingsPath, 1);
         gtk_widget_path_append_with_siblings(path, siblingsPath, 0);
     }
-    else 
+    else
     {
         gtk_widget_path_append_with_siblings(path, siblingsPath, 0);
         gtk_widget_path_append_with_siblings(path, siblingsPath, 1);
commit 3c8b99a3fcbaf0192c9b5ffe2b94f7f84e2dde2b
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Nov 3 19:12:10 2011 +0000

    IsGreyPalette: belt and braces, empty palettes are grey (apparently)

diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 41c90e9..aca81ab 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -207,7 +207,7 @@ public:
     inline BitmapColor&         operator[]( sal_uInt16 nIndex );
 
     inline sal_uInt16           GetBestIndex( const BitmapColor& rCol ) const;
-    bool                        IsGreyPalette() const { return mbIsGrey; }
+    bool                        IsGreyPalette() const { return !GetEntryCount() || mbIsGrey; }
     void                        SetGreyPalette( bool bGrey ) { mbIsGrey = bGrey; }
 };