vcl/inc/unx/gtk/gtkframe.hxx | 2 -- vcl/unx/gtk3/gtkframe.cxx | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-)
New commits: commit 7e342018492689e6de0de145a5d28346e210dfe2 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jan 17 17:02:45 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Jan 18 10:48:59 2023 +0000 only need ooo_fixed for gtk3 Change-Id: I2ddc54d013dbeeb75fd07bd5c4ec413306472167 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145680 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 5b2df74d3f5c..be82779142b1 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -657,8 +657,6 @@ public: void AllowCycleFocusOut(); }; -#define OOO_TYPE_FIXED ooo_fixed_get_type() - #if !GTK_CHECK_VERSION(4, 0, 0) extern "C" { diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index d8c48891e757..e9127b23e659 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -891,19 +891,14 @@ ooo_fixed_get_preferred_width(GtkWidget*, gint *minimum, gint *natural) *minimum = 0; *natural = 0; } -#endif static void ooo_fixed_class_init(GtkFixedClass *klass) { -#if !GTK_CHECK_VERSION(4,0,0) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); widget_class->get_accessible = ooo_fixed_get_accessible; widget_class->get_preferred_height = ooo_fixed_get_preferred_height; widget_class->get_preferred_width = ooo_fixed_get_preferred_width; -#else - (void)klass; -#endif } /* @@ -939,6 +934,8 @@ ooo_fixed_get_type() return type; } +#endif + void GtkSalFrame::updateScreenNumber() { #if !GTK_CHECK_VERSION(4,0,0)
