diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-01 14:14:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-02 12:49:16 +0100 |
| commit | e90f86db77476f16a28c44c96771c925c6172d6d (patch) | |
| tree | 17a0a0e08a60e0d68e8aa44e3b8dc006b578f53d /libreofficekit | |
| parent | 1cbee4822ab3b018c22111e6314f23add02b5521 (diff) | |
require at least gtk3 3.10.0 to build gtk vclplug
Change-Id: I4ca34184237d05b999c92648494c306a1f1371cd
Reviewed-on: https://gerrit.libreoffice.org/45668
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'libreofficekit')
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx | 2 | ||||
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx index 9dee02a0ac45..3c4457b38215 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx @@ -30,9 +30,7 @@ void GtvHelpers::userPromptDialog(GtkWindow* pWindow, const std::string& aTitle, for (const auto& entry : aEntries) { GtkWidget* pEntry = gtk_entry_new(); -#if GTK_CHECK_VERSION(3,2,0) gtk_entry_set_placeholder_text(GTK_ENTRY(pEntry), entry.first.c_str()); -#endif gtk_container_add(GTK_CONTAINER(pEntryArea), pEntry); } diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx index fe7d33210ce1..9c075f571170 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx @@ -159,21 +159,15 @@ static void addMoreUnoParam(GtkWidget* /*pWidget*/, gpointer userdata) GtkWidget* pTypeEntry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(pParamContainer), pTypeEntry, TRUE, TRUE, 2); -#if GTK_CHECK_VERSION(3,2,0) gtk_entry_set_placeholder_text(GTK_ENTRY(pTypeEntry), "Param type (Eg. boolean, string etc.)"); -#endif GtkWidget* pNameEntry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(pParamContainer), pNameEntry, TRUE, TRUE, 2); -#if GTK_CHECK_VERSION(3,2,0) gtk_entry_set_placeholder_text(GTK_ENTRY(pNameEntry), "Param name"); -#endif GtkWidget* pValueEntry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(pParamContainer), pValueEntry, TRUE, TRUE, 2); -#if GTK_CHECK_VERSION(3,2,0) gtk_entry_set_placeholder_text(GTK_ENTRY(pValueEntry), "Param value"); -#endif GtkWidget* pRemoveButton = gtk_button_new_from_icon_name("list-remove-symbolic", GTK_ICON_SIZE_BUTTON); g_signal_connect(pRemoveButton, "clicked", G_CALLBACK(removeUnoParam), pUnoParamAreaBox); @@ -220,9 +214,7 @@ void unoCommandDebugger(GtkWidget* pButton, gpointer /* pItem */) GtkWidget* pUnoCmdEntry = gtk_entry_new (); gtk_box_pack_start(GTK_BOX(pUnoCmdAreaBox), pUnoCmdEntry, TRUE, TRUE, 2); -#if GTK_CHECK_VERSION(3,2,0) gtk_entry_set_placeholder_text(GTK_ENTRY(pUnoCmdEntry), "UNO command (Eg. Bold, Italic etc.)"); -#endif GtkWidget* pUnoParamAreaBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start(GTK_BOX(pDialogMessageArea), pUnoParamAreaBox, TRUE, TRUE, 2); |