[Libreoffice-commits] core.git: vcl/Executable_xid_fullscreen_on_all_monitors.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/unx
Michael Meeks
michael.meeks at collabora.com
Mon Nov 16 09:36:22 PST 2015
vcl/Executable_xid_fullscreen_on_all_monitors.mk | 2
vcl/Library_vclplug_gtk.mk | 26
vcl/Library_vclplug_gtk3.mk | 32
vcl/unx/gtk/app/gtkdata.cxx | 1039 ----
vcl/unx/gtk/app/gtkinst.cxx | 471 --
vcl/unx/gtk/app/gtksys.cxx | 280 -
vcl/unx/gtk/gdi/gtkprintwrapper.cxx | 346 -
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4682 --------------------
vcl/unx/gtk/gdi/salprn-gtk.cxx | 1146 ----
vcl/unx/gtk/gloactiongroup.cxx | 439 +
vcl/unx/gtk/glomenu.cxx | 641 ++
vcl/unx/gtk/gtkdata.cxx | 1039 ++++
vcl/unx/gtk/gtkinst.cxx | 471 ++
vcl/unx/gtk/gtkobject.cxx | 219
vcl/unx/gtk/gtkprintwrapper.cxx | 346 +
vcl/unx/gtk/gtkprintwrapper.hxx | 126
vcl/unx/gtk/gtksalframe.cxx | 4518 +++++++++++++++++++
vcl/unx/gtk/gtksalmenu.cxx | 783 +++
vcl/unx/gtk/gtksys.cxx | 280 +
vcl/unx/gtk/hudawareness.cxx | 112
vcl/unx/gtk/inc/gtkprintwrapper.hxx | 126
vcl/unx/gtk/salnativewidgets-gtk.cxx | 4682 ++++++++++++++++++++
vcl/unx/gtk/salprn-gtk.cxx | 1146 ++++
vcl/unx/gtk/window/gloactiongroup.cxx | 439 -
vcl/unx/gtk/window/glomenu.cxx | 641 --
vcl/unx/gtk/window/gtkobject.cxx | 219
vcl/unx/gtk/window/gtksalframe.cxx | 4518 -------------------
vcl/unx/gtk/window/gtksalmenu.cxx | 783 ---
vcl/unx/gtk/window/hudawareness.cxx | 112
vcl/unx/gtk/window/xid_fullscreen_on_all_monitors.c | 99
vcl/unx/gtk/xid_fullscreen_on_all_monitors.c | 99
vcl/unx/gtk3/app/gtk3fpicker.cxx | 15
vcl/unx/gtk3/app/gtk3gtkdata.cxx | 12
vcl/unx/gtk3/app/gtk3gtkinst.cxx | 640 --
vcl/unx/gtk3/app/gtk3gtksys.cxx | 12
vcl/unx/gtk3/cairo_gtk3_cairo.cxx | 117
vcl/unx/gtk3/cairo_gtk3_cairo.hxx | 51
vcl/unx/gtk3/gdi/cairo_gtk3_cairo.cxx | 117
vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx | 51
vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx | 43
vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx | 34
vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx | 12
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 2153 ---------
vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx | 12
vcl/unx/gtk3/gtk3cairotextrender.cxx | 43
vcl/unx/gtk3/gtk3cairotextrender.hxx | 34
vcl/unx/gtk3/gtk3fpicker.cxx | 15
vcl/unx/gtk3/gtk3gloactiongroup.cxx | 5
vcl/unx/gtk3/gtk3glomenu.cxx | 5
vcl/unx/gtk3/gtk3gtkdata.cxx | 12
vcl/unx/gtk3/gtk3gtkframe.cxx | 12
vcl/unx/gtk3/gtk3gtkinst.cxx | 640 ++
vcl/unx/gtk3/gtk3gtkobject.cxx | 12
vcl/unx/gtk3/gtk3gtkprintwrapper.cxx | 12
vcl/unx/gtk3/gtk3gtksalmenu.cxx | 5
vcl/unx/gtk3/gtk3gtksys.cxx | 12
vcl/unx/gtk3/gtk3hudawareness.cxx | 4
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 2153 +++++++++
vcl/unx/gtk3/gtk3salprn-gtk.cxx | 12
vcl/unx/gtk3/gtkprintwrapper.hxx | 17
vcl/unx/gtk3/inc/gtkprintwrapper.hxx | 17
vcl/unx/gtk3/window/gtk3gloactiongroup.cxx | 5
vcl/unx/gtk3/window/gtk3glomenu.cxx | 5
vcl/unx/gtk3/window/gtk3gtkframe.cxx | 12
vcl/unx/gtk3/window/gtk3gtkobject.cxx | 12
vcl/unx/gtk3/window/gtk3gtksalmenu.cxx | 5
vcl/unx/gtk3/window/gtk3hudawareness.cxx | 4
67 files changed, 18092 insertions(+), 18092 deletions(-)
New commits:
commit a6c5cfa56d2bdebb899d05f702c29d79c39be299
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Mon Nov 16 15:38:03 2015 +0000
vcl: de-layer needless module fragmentation in gtk and gtk3.
Change-Id: I299fa196e960f14e9480e2ac1047bcdcc95b1021
diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
index ee17162..296436a 100644
--- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk
+++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\
endif
$(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\
- vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \
+ vcl/unx/gtk/xid_fullscreen_on_all_monitors \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index ec7f2f8..8a61131 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/unx \
- -I$(SRCDIR)/vcl/unx/gtk/inc \
+ -I$(SRCDIR)/vcl/unx/gtk \
))
$(eval $(call gb_Library_add_defs,vclplug_gtk,\
@@ -96,12 +96,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
vcl/unx/gtk/a11y/atkvalue \
vcl/unx/gtk/a11y/atkwindow \
vcl/unx/gtk/a11y/atkwrapper \
- vcl/unx/gtk/app/gtkdata \
- vcl/unx/gtk/app/gtkinst \
- vcl/unx/gtk/app/gtksys \
- vcl/unx/gtk/gdi/salnativewidgets-gtk \
- vcl/unx/gtk/window/gtksalframe \
- vcl/unx/gtk/window/gtkobject \
+ vcl/unx/gtk/gtkdata \
+ vcl/unx/gtk/gtkinst \
+ vcl/unx/gtk/gtksys \
+ vcl/unx/gtk/salnativewidgets-gtk \
+ vcl/unx/gtk/gtksalframe \
+ vcl/unx/gtk/gtkobject \
vcl/unx/gtk/fpicker/resourceprovider \
vcl/unx/gtk/fpicker/SalGtkPicker \
vcl/unx/gtk/fpicker/SalGtkFilePicker \
@@ -111,18 +111,18 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
ifneq ($(ENABLE_DBUS),)
ifneq ($(ENABLE_GIO),)
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
- vcl/unx/gtk/window/gloactiongroup \
- vcl/unx/gtk/window/gtksalmenu \
- vcl/unx/gtk/window/glomenu \
- vcl/unx/gtk/window/hudawareness \
+ vcl/unx/gtk/gloactiongroup \
+ vcl/unx/gtk/gtksalmenu \
+ vcl/unx/gtk/glomenu \
+ vcl/unx/gtk/hudawareness \
))
endif
endif
ifeq ($(ENABLE_GTK_PRINT),TRUE)
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
- vcl/unx/gtk/gdi/gtkprintwrapper \
- vcl/unx/gtk/gdi/salprn-gtk \
+ vcl/unx/gtk/gtkprintwrapper \
+ vcl/unx/gtk/salprn-gtk \
))
endif
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 515a81c..e36dc21 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/unx \
- -I$(SRCDIR)/vcl/unx/gtk3/inc \
+ -I$(SRCDIR)/vcl/unx/gtk3 \
))
$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\
@@ -98,21 +98,21 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/a11y/gtk3atkvalue \
vcl/unx/gtk3/a11y/gtk3atkwindow \
vcl/unx/gtk3/a11y/gtk3atkwrapper \
- vcl/unx/gtk3/app/gtk3gtkdata \
- vcl/unx/gtk3/app/gtk3gtkinst \
- vcl/unx/gtk3/app/gtk3gtksys \
- vcl/unx/gtk3/app/gtk3fpicker \
- vcl/unx/gtk3/gdi/cairo_gtk3_cairo \
- vcl/unx/gtk3/gdi/gtk3cairotextrender \
- vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
- vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \
- vcl/unx/gtk3/gdi/gtk3salprn-gtk \
- vcl/unx/gtk3/window/gtk3gtkframe \
- vcl/unx/gtk3/window/gtk3gtkobject \
- vcl/unx/gtk3/window/gtk3gtksalmenu \
- vcl/unx/gtk3/window/gtk3glomenu \
- vcl/unx/gtk3/window/gtk3gloactiongroup \
- vcl/unx/gtk3/window/gtk3hudawareness \
+ vcl/unx/gtk3/gtk3gtkdata \
+ vcl/unx/gtk3/gtk3gtkinst \
+ vcl/unx/gtk3/gtk3gtksys \
+ vcl/unx/gtk3/gtk3fpicker \
+ vcl/unx/gtk3/cairo_gtk3_cairo \
+ vcl/unx/gtk3/gtk3cairotextrender \
+ vcl/unx/gtk3/gtk3gtkprintwrapper \
+ vcl/unx/gtk3/gtk3salnativewidgets-gtk \
+ vcl/unx/gtk3/gtk3salprn-gtk \
+ vcl/unx/gtk3/gtk3gtkframe \
+ vcl/unx/gtk3/gtk3gtkobject \
+ vcl/unx/gtk3/gtk3gtksalmenu \
+ vcl/unx/gtk3/gtk3glomenu \
+ vcl/unx/gtk3/gtk3gloactiongroup \
+ vcl/unx/gtk3/gtk3hudawareness \
))
ifeq ($(OS),LINUX)
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx
similarity index 100%
rename from vcl/unx/gtk/window/gloactiongroup.cxx
rename to vcl/unx/gtk/gloactiongroup.cxx
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/glomenu.cxx
similarity index 100%
rename from vcl/unx/gtk/window/glomenu.cxx
rename to vcl/unx/gtk/glomenu.cxx
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
similarity index 100%
rename from vcl/unx/gtk/app/gtkdata.cxx
rename to vcl/unx/gtk/gtkdata.cxx
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
similarity index 100%
rename from vcl/unx/gtk/app/gtkinst.cxx
rename to vcl/unx/gtk/gtkinst.cxx
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/gtkobject.cxx
similarity index 100%
rename from vcl/unx/gtk/window/gtkobject.cxx
rename to vcl/unx/gtk/gtkobject.cxx
diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gtkprintwrapper.cxx
similarity index 100%
rename from vcl/unx/gtk/gdi/gtkprintwrapper.cxx
rename to vcl/unx/gtk/gtkprintwrapper.cxx
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/gtkprintwrapper.hxx
similarity index 100%
rename from vcl/unx/gtk/inc/gtkprintwrapper.hxx
rename to vcl/unx/gtk/gtkprintwrapper.hxx
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
similarity index 100%
rename from vcl/unx/gtk/window/gtksalframe.cxx
rename to vcl/unx/gtk/gtksalframe.cxx
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
similarity index 100%
rename from vcl/unx/gtk/window/gtksalmenu.cxx
rename to vcl/unx/gtk/gtksalmenu.cxx
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx
similarity index 100%
rename from vcl/unx/gtk/app/gtksys.cxx
rename to vcl/unx/gtk/gtksys.cxx
diff --git a/vcl/unx/gtk/window/hudawareness.cxx b/vcl/unx/gtk/hudawareness.cxx
similarity index 100%
rename from vcl/unx/gtk/window/hudawareness.cxx
rename to vcl/unx/gtk/hudawareness.cxx
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
similarity index 100%
rename from vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
rename to vcl/unx/gtk/salnativewidgets-gtk.cxx
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
similarity index 100%
rename from vcl/unx/gtk/gdi/salprn-gtk.cxx
rename to vcl/unx/gtk/salprn-gtk.cxx
diff --git a/vcl/unx/gtk/window/xid_fullscreen_on_all_monitors.c b/vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
similarity index 100%
rename from vcl/unx/gtk/window/xid_fullscreen_on_all_monitors.c
rename to vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
diff --git a/vcl/unx/gtk3/app/gtk3fpicker.cxx b/vcl/unx/gtk3/app/gtk3fpicker.cxx
deleted file mode 100644
index 336d47a..0000000
--- a/vcl/unx/gtk3/app/gtk3fpicker.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "../../gtk/fpicker/resourceprovider.cxx"
-#include "../../gtk/fpicker/SalGtkPicker.cxx"
-#include "../../gtk/fpicker/SalGtkFilePicker.cxx"
-#include "../../gtk/fpicker/SalGtkFolderPicker.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.cxx b/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
similarity index 100%
rename from vcl/unx/gtk3/gdi/cairo_gtk3_cairo.cxx
rename to vcl/unx/gtk3/cairo_gtk3_cairo.cxx
diff --git a/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
similarity index 100%
rename from vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx
rename to vcl/unx/gtk3/cairo_gtk3_cairo.hxx
diff --git a/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx b/vcl/unx/gtk3/gtk3cairotextrender.cxx
similarity index 100%
rename from vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx
rename to vcl/unx/gtk3/gtk3cairotextrender.cxx
diff --git a/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx b/vcl/unx/gtk3/gtk3cairotextrender.hxx
similarity index 100%
rename from vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx
rename to vcl/unx/gtk3/gtk3cairotextrender.hxx
diff --git a/vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx b/vcl/unx/gtk3/gtk3fpicker.cxx
similarity index 67%
rename from vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx
rename to vcl/unx/gtk3/gtk3fpicker.cxx
index f456b6e..9b83c57 100644
--- a/vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx
+++ b/vcl/unx/gtk3/gtk3fpicker.cxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "../../gtk/gdi/gtkprintwrapper.cxx"
+#include "../gtk/fpicker/resourceprovider.cxx"
+#include "../gtk/fpicker/SalGtkPicker.cxx"
+#include "../gtk/fpicker/SalGtkFilePicker.cxx"
+#include "../gtk/fpicker/SalGtkFolderPicker.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3gloactiongroup.cxx b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
similarity index 74%
rename from vcl/unx/gtk3/window/gtk3gloactiongroup.cxx
rename to vcl/unx/gtk3/gtk3gloactiongroup.cxx
index 7f26437..749f543 100644
--- a/vcl/unx/gtk3/window/gtk3gloactiongroup.cxx
+++ b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
@@ -1,5 +1,5 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "../../gtk/window/gloactiongroup.cxx"
+#include "../gtk/gloactiongroup.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3glomenu.cxx b/vcl/unx/gtk3/gtk3glomenu.cxx
similarity index 77%
rename from vcl/unx/gtk3/window/gtk3glomenu.cxx
rename to vcl/unx/gtk3/gtk3glomenu.cxx
index 6ca68cd..e894b09 100644
--- a/vcl/unx/gtk3/window/gtk3glomenu.cxx
+++ b/vcl/unx/gtk3/gtk3glomenu.cxx
@@ -1,5 +1,5 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "../../gtk/window/glomenu.cxx"
+#include "../gtk/glomenu.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
similarity index 91%
rename from vcl/unx/gtk3/app/gtk3gtkdata.cxx
rename to vcl/unx/gtk3/gtk3gtkdata.cxx
index 28745a4..df53f34 100644
--- a/vcl/unx/gtk3/app/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -7,6 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "../../gtk/app/gtkdata.cxx"
+#include "../gtk/gtkdata.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
new file mode 100644
index 0000000..26d1a07
--- /dev/null
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "../gtk/gtksalframe.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
similarity index 99%
rename from vcl/unx/gtk3/app/gtk3gtkinst.cxx
rename to vcl/unx/gtk3/gtk3gtkinst.cxx
index 8482ed4..9f15db0 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "../../gtk/app/gtkinst.cxx"
+#include "../gtk/gtkinst.cxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include "com/sun/star/lang/XServiceInfo.hpp"
diff --git a/vcl/unx/gtk3/window/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
similarity index 90%
rename from vcl/unx/gtk3/window/gtk3gtkobject.cxx
rename to vcl/unx/gtk3/gtk3gtkobject.cxx
index efbafe71..96c1527 100644
--- a/vcl/unx/gtk3/window/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -7,6 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "../../gtk/window/gtkobject.cxx"
+#include "../gtk/gtkobject.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
new file mode 100644
index 0000000..edefca9
--- /dev/null
+++ b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "../gtk/gtkprintwrapper.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
similarity index 75%
rename from vcl/unx/gtk3/window/gtk3gtksalmenu.cxx
rename to vcl/unx/gtk3/gtk3gtksalmenu.cxx
index ef288ba..d465594 100644
--- a/vcl/unx/gtk3/window/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1,5 +1,5 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "../../gtk/window/gtksalmenu.cxx"
+#include "../gtk/gtksalmenu.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtksys.cxx b/vcl/unx/gtk3/gtk3gtksys.cxx
similarity index 91%
rename from vcl/unx/gtk3/app/gtk3gtksys.cxx
rename to vcl/unx/gtk3/gtk3gtksys.cxx
index 2fcec09..2406e0a 100644
--- a/vcl/unx/gtk3/app/gtk3gtksys.cxx
+++ b/vcl/unx/gtk3/gtk3gtksys.cxx
@@ -7,6 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "../../gtk/app/gtksys.cxx"
+#include "../gtk/gtksys.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3hudawareness.cxx b/vcl/unx/gtk3/gtk3hudawareness.cxx
similarity index 74%
rename from vcl/unx/gtk3/window/gtk3hudawareness.cxx
rename to vcl/unx/gtk3/gtk3hudawareness.cxx
index 76ea94a..3d928f0 100644
--- a/vcl/unx/gtk3/window/gtk3hudawareness.cxx
+++ b/vcl/unx/gtk3/gtk3hudawareness.cxx
@@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "../../gtk/window/hudawareness.cxx"
+#include "../gtk/hudawareness.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
similarity index 100%
rename from vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
rename to vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
diff --git a/vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx b/vcl/unx/gtk3/gtk3salprn-gtk.cxx
similarity index 90%
rename from vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx
rename to vcl/unx/gtk3/gtk3salprn-gtk.cxx
index 708c0ba..16bf17c 100644
--- a/vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salprn-gtk.cxx
@@ -7,6 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "../../gtk/gdi/salprn-gtk.cxx"
+#include "../gtk/salprn-gtk.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/inc/gtkprintwrapper.hxx b/vcl/unx/gtk3/gtkprintwrapper.hxx
similarity index 92%
rename from vcl/unx/gtk3/inc/gtkprintwrapper.hxx
rename to vcl/unx/gtk3/gtkprintwrapper.hxx
index 032080d..9ee46e7 100644
--- a/vcl/unx/gtk3/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk3/gtkprintwrapper.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX
#define INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX
-#include "../../gtk/inc/gtkprintwrapper.hxx"
+#include "../gtk/gtkprintwrapper.hxx"
#endif // INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX
diff --git a/vcl/unx/gtk3/window/gtk3gtkframe.cxx b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
deleted file mode 100644
index 5710d50..0000000
--- a/vcl/unx/gtk3/window/gtk3gtkframe.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "../../gtk/window/gtksalframe.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list