[Libreoffice-commits] core.git: libreofficekit/qa

Andrzej Hunt andrzej.hunt at collabora.com
Thu Jul 31 02:37:04 PDT 2014


 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 62da1a834128f5762fa2e6ceb35fa61372ed5949
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Thu Jul 31 11:26:59 2014 +0200

    GtkComboBoxText requires gtk >= 2.24 (again).
    
    Broken in 77d083130948fa35f9f404656b8c170060e78043.

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 9a40325..112e03e 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -27,7 +27,11 @@ static int help()
 static GtkWidget* pDocView;
 static GtkWidget* pDocViewQuad;
 static GtkWidget* pVBox;
+// GtkComboBox requires gtk 2.24 or later
+#if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION > 2
 static GtkComboBoxText* pPartSelector;
+#endif
+
 static LibreOfficeKit* pOffice;
 static char* pFileName;
 


More information about the Libreoffice-commits mailing list