From f7cd9542c8cbc984589ec3ae7057ee1f7e402ad6 Mon Sep 17 00:00:00 2001 From: gambas Date: Wed, 18 Aug 2021 21:53:06 +0200 Subject: [PATCH] 'Desktop.Type' property is now implemented in 'gb.gui.base'. [GB.GTK] * NEW: 'Desktop.Type' property is now implemented in 'gb.gui.base'. [GB.GTK3] * NEW: 'Desktop.Type' property is now implemented in 'gb.gui.base'. [GB.QT4] * NEW: 'Desktop.Type' property is now implemented in 'gb.gui.base'. [GB.QT5] * NEW: 'Desktop.Type' property is now implemented in 'gb.gui.base'. --- gb.gtk/src/CScreen.cpp | 8 -------- gb.gtk/src/Makefile.am | 1 - gb.gtk/src/desktop.c | 1 - gb.gtk/src/desktop.h | 1 - gb.gtk/src/main.cpp | 1 - gb.gtk3/src/Makefile.am | 3 +-- gb.gtk3/src/desktop.c | 1 - gb.gtk3/src/desktop.h | 1 - gb.gtk3/src/main.cpp | 1 - gb.qt4/src/CScreen.cpp | 9 --------- gb.qt4/src/Makefile.am | 1 - gb.qt5/src/Makefile.am | 1 - gb.qt5/src/desktop.c | 1 - gb.qt5/src/desktop.h | 1 - gb.qt5/src/main.cpp | 1 - 15 files changed, 1 insertion(+), 31 deletions(-) delete mode 120000 gb.gtk/src/desktop.c delete mode 120000 gb.gtk/src/desktop.h delete mode 120000 gb.gtk3/src/desktop.c delete mode 120000 gb.gtk3/src/desktop.h delete mode 120000 gb.qt5/src/desktop.c delete mode 120000 gb.qt5/src/desktop.h diff --git a/gb.gtk/src/CScreen.cpp b/gb.gtk/src/CScreen.cpp index 94e39989c..f0e183e7a 100644 --- a/gb.gtk/src/CScreen.cpp +++ b/gb.gtk/src/CScreen.cpp @@ -34,7 +34,6 @@ #include "gapplication.h" #include "gmainwindow.h" #include "cpaint_impl.h" -#include "desktop.h" extern int CWINDOW_Embedder; extern bool CWINDOW_Embedded; @@ -161,12 +160,6 @@ BEGIN_PROPERTY(Desktop_Scale) END_PROPERTY -BEGIN_PROPERTY(Desktop_Type) - - GB.ReturnConstZeroString(DESKTOP_get_type()); - -END_PROPERTY - BEGIN_PROPERTY(Desktop_Platform) #ifdef GTK3 @@ -521,7 +514,6 @@ GB_DESC DesktopDesc[] = GB_STATIC_METHOD("Screenshot", "Picture", Desktop_Screenshot, "[(X)i(Y)i(Width)i(Height)i]"), - GB_STATIC_PROPERTY_READ("Type", "s", Desktop_Type), GB_STATIC_PROPERTY_READ("Platform", "s", Desktop_Platform), GB_END_DECLARE diff --git a/gb.gtk/src/Makefile.am b/gb.gtk/src/Makefile.am index 3bf43bab3..75c2b6482 100644 --- a/gb.gtk/src/Makefile.am +++ b/gb.gtk/src/Makefile.am @@ -77,7 +77,6 @@ gb_gtk_la_SOURCES = \ gprinter.h gprinter.cpp \ gglarea.h gglarea.cpp \ x11.h x11.c \ - desktop.h desktop.c \ sm/bonobo-macros.h \ sm/gnome-macros.h \ sm/gnome-uidefs.h \ diff --git a/gb.gtk/src/desktop.c b/gb.gtk/src/desktop.c deleted file mode 120000 index d7d642ed3..000000000 --- a/gb.gtk/src/desktop.c +++ /dev/null @@ -1 +0,0 @@ -../../gb.qt4/src/desktop.c \ No newline at end of file diff --git a/gb.gtk/src/desktop.h b/gb.gtk/src/desktop.h deleted file mode 120000 index f260187ed..000000000 --- a/gb.gtk/src/desktop.h +++ /dev/null @@ -1 +0,0 @@ -../../gb.qt4/src/desktop.h \ No newline at end of file diff --git a/gb.gtk/src/main.cpp b/gb.gtk/src/main.cpp index c0f0647cd..7e5518a58 100644 --- a/gb.gtk/src/main.cpp +++ b/gb.gtk/src/main.cpp @@ -33,7 +33,6 @@ #include "gkey.h" #include "x11.h" -#include "desktop.h" #include "CScreen.h" #include "CStyle.h" #include "CDraw.h" diff --git a/gb.gtk3/src/Makefile.am b/gb.gtk3/src/Makefile.am index dae15d2c5..b38263e81 100644 --- a/gb.gtk3/src/Makefile.am +++ b/gb.gtk3/src/Makefile.am @@ -73,5 +73,4 @@ gb_gtk3_la_SOURCES = \ gclipboard.h \ gdrag.h gdrag.cpp \ gtools.h kentities.h \ - gprinter.h gprinter.cpp \ - desktop.h desktop.c + gprinter.h gprinter.cpp diff --git a/gb.gtk3/src/desktop.c b/gb.gtk3/src/desktop.c deleted file mode 120000 index d990cd1dc..000000000 --- a/gb.gtk3/src/desktop.c +++ /dev/null @@ -1 +0,0 @@ -../../gb.gtk/src/desktop.c \ No newline at end of file diff --git a/gb.gtk3/src/desktop.h b/gb.gtk3/src/desktop.h deleted file mode 120000 index 3274ce80e..000000000 --- a/gb.gtk3/src/desktop.h +++ /dev/null @@ -1 +0,0 @@ -../../gb.gtk/src/desktop.h \ No newline at end of file diff --git a/gb.gtk3/src/main.cpp b/gb.gtk3/src/main.cpp index ff3225e45..1acda7c86 100644 --- a/gb.gtk3/src/main.cpp +++ b/gb.gtk3/src/main.cpp @@ -32,7 +32,6 @@ #include "watcher.h" #include "gkey.h" -#include "desktop.h" #include "CScreen.h" #include "CStyle.h" #include "CDraw.h" diff --git a/gb.qt4/src/CScreen.cpp b/gb.qt4/src/CScreen.cpp index 7b2696da8..2629b3670 100644 --- a/gb.qt4/src/CScreen.cpp +++ b/gb.qt4/src/CScreen.cpp @@ -48,8 +48,6 @@ #include "x11.h" #endif -#include "desktop.h" - #ifdef QT5 #define DESKTOP_INFO() (QGuiApplication::screens().front()->availableGeometry()) #define SCREEN_INFO(_id) (QGuiApplication::screens().at(_id)->geometry()) @@ -176,12 +174,6 @@ BEGIN_PROPERTY(Desktop_Scale) END_PROPERTY -BEGIN_PROPERTY(Desktop_Type) - - GB.ReturnConstZeroString(DESKTOP_get_type()); - -END_PROPERTY - BEGIN_PROPERTY(Desktop_Platform) GB.ReturnConstZeroString(MAIN_platform); @@ -564,7 +556,6 @@ GB_DESC DesktopDesc[] = GB_STATIC_METHOD("Screenshot", "Picture", Desktop_Screenshot, "[(X)i(Y)i(Width)i(Height)i]"), - GB_STATIC_PROPERTY_READ("Type", "s", Desktop_Type), GB_STATIC_PROPERTY_READ("Platform", "s", Desktop_Platform), GB_END_DECLARE diff --git a/gb.qt4/src/Makefile.am b/gb.qt4/src/Makefile.am index 0c83f21c0..5df73f8e2 100644 --- a/gb.qt4/src/Makefile.am +++ b/gb.qt4/src/Makefile.am @@ -14,7 +14,6 @@ gb_qt4_la_CPPFLAGS = @QT_INC@ -I$(top_srcdir)/share/ gb_qt4_la_SOURCES = \ x11.h x11.c \ - desktop.h desktop.c \ gb.qt.h main.h main_moc.cpp main.cpp \ CFont.h CFont.cpp \ CScreen.h CScreen.cpp \ diff --git a/gb.qt5/src/Makefile.am b/gb.qt5/src/Makefile.am index 74af912e4..34888c344 100644 --- a/gb.qt5/src/Makefile.am +++ b/gb.qt5/src/Makefile.am @@ -12,7 +12,6 @@ gb_qt5_la_CXXFLAGS = @THREAD_INC@ -DGB_QT_COMPONENT $(AM_CXXFLAGS) -std=c++11 gb_qt5_la_CPPFLAGS = @QT5_INC@ -I$(top_srcdir)/share/ gb_qt5_la_SOURCES = \ - desktop.h desktop.c \ gb.qt.h main.h main_moc.cpp main.cpp \ CFont.h CFont.cpp \ CScreen.h CScreen.cpp \ diff --git a/gb.qt5/src/desktop.c b/gb.qt5/src/desktop.c deleted file mode 120000 index d7d642ed3..000000000 --- a/gb.qt5/src/desktop.c +++ /dev/null @@ -1 +0,0 @@ -../../gb.qt4/src/desktop.c \ No newline at end of file diff --git a/gb.qt5/src/desktop.h b/gb.qt5/src/desktop.h deleted file mode 120000 index f260187ed..000000000 --- a/gb.qt5/src/desktop.h +++ /dev/null @@ -1 +0,0 @@ -../../gb.qt4/src/desktop.h \ No newline at end of file diff --git a/gb.qt5/src/main.cpp b/gb.qt5/src/main.cpp index 41d938a58..7feea5cfb 100644 --- a/gb.qt5/src/main.cpp +++ b/gb.qt5/src/main.cpp @@ -91,7 +91,6 @@ #include "cpaint_impl.h" #include "ctrayicon.h" -#include "desktop.h" #include "gb.qt.platform.h" #include "fix_style.h"