[dasher] g/c The GPE Palmtop Environment which had its last release over a decade ago.
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] g/c The GPE Palmtop Environment which had its last release over a decade ago.
- Date: Wed, 2 Jun 2021 11:25:57 +0000 (UTC)
commit 3d15296bb95fd94ab65641b9d49942945e840f14
Author: Patrick Welche <prlw1 cam ac uk>
Date: Wed Jun 2 12:17:55 2021 +0100
g/c The GPE Palmtop Environment which had its last release over a decade ago.
INSTALL.Linux | 2 -
Src/Gtk2/Makefile.am | 9 +-
Src/Gtk2/dasher_main.cpp | 3 -
Src/Gtk2/gpesettings_store.cc | 224 -------------------------------------
Src/Gtk2/gpesettings_store.h | 23 ----
Src/README_directory_structure.txt | 2 +-
Src/main.cc | 13 ---
configure.ac | 19 ----
8 files changed, 2 insertions(+), 293 deletions(-)
---
diff --git a/INSTALL.Linux b/INSTALL.Linux
index 5e36b6448..038d1ff38 100644
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -55,8 +55,6 @@ correctly build without modifications to the source code. If you are
willing to invest some time in getting these up to date, please let us
know!
- --with-gpe Build binaries for the GPE palmtop environment.
-
--with-qte Build binaries using the QTE environment.
diff --git a/Src/Gtk2/Makefile.am b/Src/Gtk2/Makefile.am
index b7cb2fbf8..8f66b3f1b 100644
--- a/Src/Gtk2/Makefile.am
+++ b/Src/Gtk2/Makefile.am
@@ -5,12 +5,6 @@ noinst_LTLIBRARIES = libdashergtk.la libdashercontrol.la
#bin_PROGRAMS = dasher-config
-if WITH_GPE
-settings_store = gpesettings_store.cc gpesettings_store.h
-else
-settings_store =
-endif
-
#dasher_config_SOURCES = \
# DasherAppSettings.cpp \
# DasherAppSettings.h \
@@ -40,8 +34,7 @@ libdashercontrol_la_SOURCES = \
custom_marshal.cpp \
custom_marshal.h \
joystick_input.h \
- mouse_input.h \
- $(settings_store)
+ mouse_input.h
if USE_SPEECHDISPATCHER
libdashercontrol_la_SOURCES += SpeechDispatcher.cpp
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index c7fce5333..e399910cf 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -406,9 +406,6 @@ dasher_main_load_interface(DasherMain *pSelf) {
// dasher_main_build_context_menu(pSelf);
// Set up any non-registry-dependent options
-#ifdef WITH_GPE
- gtk_window_set_decorated(pPrivate->pMainWindow, false);
-#endif
// Hide any widgets which aren't appropriate for this mode
if(pPrivate->pAppSettings->GetLong(APP_LP_STYLE) == APP_STYLE_DIRECT) {
diff --git a/Src/README_directory_structure.txt b/Src/README_directory_structure.txt
index fc28a5eb3..a9368d0b9 100644
--- a/Src/README_directory_structure.txt
+++ b/Src/README_directory_structure.txt
@@ -1,6 +1,6 @@
DasherCore - The Dasher Engine
Win32 - The MS Windows GUI, coded using the Windows API (not MFC).
-Gtk2 - The Unix GUI, coded using GTK2. Also includes GPE code.
+Gtk2 - The Unix GUI, coded using GTK2.
MacOSX - The MacOS X GUI, coded using Cocoa.
Qt - The QTopia GUI, aimed at QT-based palmtops
Your platform here:
diff --git a/Src/main.cc b/Src/main.cc
index 8edf97751..223225f55 100644
--- a/Src/main.cc
+++ b/Src/main.cc
@@ -13,17 +13,9 @@
/* Just to make sure the symbols for the editor are visible. */
// #include <Gtk2/dasher_editor_internal.h>
-#ifdef WITH_GPE
-#include <gpe/init.h>
-#endif
-
#include "dasher.h"
#include "dasher_main.h"
-#ifdef WITH_GPE
-#include "gpesettings_store.h"
-#endif
-
//extern int optind;
//extern const gchar *filename;
@@ -179,12 +171,7 @@ int main(int argc, char *argv[]) {
return 0;
}
-#ifdef WITH_GPE
- gpe_application_init(&argc, &argv);
- init_xsettings();
-#else
gtk_init(&argc, &argv);
-#endif
g_set_application_name("Dasher");
gtk_window_set_default_icon_name("dasher");
diff --git a/configure.ac b/configure.ac
index db1a4462c..d26940be7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,15 +62,6 @@ AC_ARG_ENABLE([speech],
[AS_HELP_STRING([--enable-speech=@<:@speechdispatcher@:>@],
[build with speech support (default is YES)])])
-AC_ARG_WITH([gpe],
- AS_HELP_STRING([--with-gpe],[build with GPE support (default is NO -- currently untested)]),
- if test "x$withval" = "xno"; then
- WITHGPE=false;
- else
- WITHGPE=true;
- fi,
- WITHGPE=false)
-
AC_ARG_ENABLE([atspi],
[AS_HELP_STRING([--enable-atspi],
[with Gtk3 use atspi rather than Xtst for direct entry mode if found (default is YES)])])
@@ -243,10 +234,6 @@ if test x"$WITHTILT" = xtrue; then
AC_DEFINE([TILT], 1, [Tilt input support enabled])
fi
-if test x"$WITHGPE" = xtrue; then
- AC_DEFINE([WITH_GPE], 1, [gpe is present])
-fi
-
dnl if test x"$WITHDARWIN" = xtrue ; then
dnl AC_DEFINE([WITH_DARWIN], 1, [Targeting Darwin/X11])
dnl fi
@@ -262,18 +249,12 @@ AC_SUBST(gthread_CFLAGS)
AM_CONDITIONAL(USE_SPEECHDISPATCHER, test $speech_module = speechdispatcher)
AM_CONDITIONAL(GNOME_HELP, test x$WITHGNOME = xtrue)
-AM_CONDITIONAL(WITH_GPE, test x$WITHGPE = xtrue)
AM_CONDITIONAL(JAPANESE, test x$WITHJAPANESE = xtrue)
AM_CONDITIONAL(JOYSTICK, test x$WITHJOYSTICK = xtrue)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-if test x"$WITHGPE" = xtrue ; then
- SETTINGS_CFLAGS=" "
- SETTINGS_LIBS="-lgpewidget -lXsettings-client -lXsettings"
-fi
-
GTKBUILD_CFLAGS="$GTK_CFLAGS $GIO_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS"
GTKBUILD_LIBS="$X_LIBS $GTK_LIBS $GIO_LIBS $SETTINGS_LIBS $gthread_LIBS"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]