summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac2
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx2
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx8
-rw-r--r--vcl/unx/gtk3/gtk3gtkdata.cxx6
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx15
5 files changed, 2 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac
index e904fe3c29cc..505aaa768948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9724,7 +9724,7 @@ if test "x$enable_gtk3" = "xyes"; then
AC_MSG_ERROR([System cairo required for gtk3 support, do not combine --enable-gtk3 with --without-system-cairo])
fi
: ${with_system_cairo:=yes}
- PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
if test "x$ENABLE_GTK3" = "xTRUE"; then
R="gtk3"
dnl Avoid installed by unpackaged files for now.
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);
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index ee95314c350e..1c6e8e2c5e11 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -200,13 +200,7 @@ GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap,
cairo_surface_destroy(source);
cairo_destroy(cr);
-#if GTK_CHECK_VERSION(3,10,0)
GdkCursor *cursor = gdk_cursor_new_from_surface(m_pGdkDisplay, s, nXHot, nYHot);
-#else
- GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface(s, 0, 0, nWidth, nHeight);
- GdkCursor *cursor = gdk_cursor_new_from_pixbuf(m_pGdkDisplay, pixbuf, nXHot, nYHot);
- g_object_unref(pixbuf);
-#endif
cairo_surface_destroy(s);
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 725c64594d92..25be18c60384 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1386,11 +1386,9 @@ void GtkSalFrame::Center()
Size GtkSalFrame::calcDefaultSize()
{
Size aScreenSize(getDisplay()->GetScreenSize(GetDisplayScreen()));
-#if GTK_CHECK_VERSION(3,10,0)
int scale = gtk_widget_get_scale_factor(m_pWindow);
aScreenSize.Width() /= scale;
aScreenSize.Height() /= scale;
-#endif
return bestmaxFrameSizeForScreenSize(aScreenSize);
}
@@ -1895,10 +1893,9 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, SetType eType, tools::Rect
gtk_window_move(GTK_WINDOW(m_pWindow), nX, nY);
-#if GTK_CHECK_VERSION(3,8,0)
gdk_window_set_fullscreen_mode( widget_get_window(m_pWindow), m_bSpanMonitorsWhenFullscreen
? GDK_FULLSCREEN_ON_ALL_MONITORS : GDK_FULLSCREEN_ON_CURRENT_MONITOR );
-#endif
+
GtkWidget* pMenuBarContainerWidget = m_pSalMenu ? m_pSalMenu->GetMenuBarContainerWidget() : nullptr;
if( eType == SetType::Fullscreen )
{
@@ -4250,7 +4247,6 @@ void GtkSalFrame::startDrag(gint nButton, gint nDragOriginX, gint nDragOriginY,
GdkDeviceManager* pDeviceManager = gdk_display_get_device_manager(getGdkDisplay());
aFakeEvent.button.device = gdk_device_manager_get_client_pointer(pDeviceManager);
-#if GTK_CHECK_VERSION(3,10,0)
GdkDragContext *pContext = gtk_drag_begin_with_coordinates(getMouseEventWidget(),
pTargetList,
sourceActions,
@@ -4258,15 +4254,6 @@ void GtkSalFrame::startDrag(gint nButton, gint nDragOriginX, gint nDragOriginY,
&aFakeEvent,
nDragOriginX,
nDragOriginY);
-#else
- GdkDragContext *pContext = gtk_drag_begin(getMouseEventWidget(),
- pTargetList,
- sourceActions,
- nButton,
- &aFakeEvent);
- (void)nDragOriginX;
- (void)nDragOriginY;
-#endif
if (!pContext)
m_pDragSource->dragFailed();
generated by cgit (git 2.34.1) at 2024-12-28 06:32:40 +0000