[gtkmm] Remove the Maemo Extensions API
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Remove the Maemo Extensions API
- Date: Tue, 10 Apr 2012 07:23:03 +0000 (UTC)
commit 09db45e7cccd31724ff5b427e8807653b0b69864
Author: Adrian Bunk <bunk stusta de>
Date: Sat Apr 7 15:16:00 2012 +0300
Remove the Maemo Extensions API
The Maemo GTK+ is not likely to ever be ported to GTK+ 3.
ChangeLog | 6 +
build/reduced.m4 | 19 ---
configure.ac | 1 -
gtk/gtkmmconfig.h.in | 3 -
gtk/src/enums.hg | 13 --
gtk/src/filelist.am | 2 -
gtk/src/gtk.defs | 2 -
gtk/src/gtk_enums_maemo.defs | 50 --------
gtk/src/gtk_methods_maemo.defs | 265 ----------------------------------------
9 files changed, 6 insertions(+), 355 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9c9f0b4..e0da5fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-10 Adrian Bunk <bunk stusta de>
+
+ Remove the Maemo Extensions API.
+
+ The Maemo GTK+ is not likely to ever be ported to GTK+ 3.
+
2012-04-09 Adrian Bunk <bunk stusta de>
Update .gitignore.
diff --git a/build/reduced.m4 b/build/reduced.m4
index 6b29d0d..26dca56 100644
--- a/build/reduced.m4
+++ b/build/reduced.m4
@@ -15,22 +15,3 @@ AC_DEFUN([GTKMM_ARG_ENABLE_API_ATKMM],
[Define if atkmm API should be built.])])
])
-
-## GLIBMM_ARG_ENABLE_API_MAEMO_EXTENSIONS
-##
-## Provide the --enable-api-maemo-extensions configure argument, disabled
-## by default. This provides gtkmm API for the additional GTK+ methods in
-## the version of GTK+ that is in the Maemo platform.
-##
-AC_DEFUN([GTKMM_ARG_ENABLE_API_MAEMO_EXTENSIONS],
-[
- AC_ARG_ENABLE([api-maemo-extensions],
- [AS_HELP_STRING([--enable-api-maemo-extensions], [Build Maemo Extensions API. @<:@default=no@:>@])],
- [gtkmm_enable_api_maemo_extensions="$enableval"],
- [gtkmm_enable_api_maemo_extensions='no'])
-
- AS_VAR_IF([gtkmm_enable_api_maemo_extensions], ['yes'],
- [AC_DEFINE([GTKMM_MAEMO_EXTENSIONS_ENABLED], [1],
- [Define if maemo extensions should be built.])])
-])
-
diff --git a/configure.ac b/configure.ac
index bff9e80..af1ff4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,6 @@ MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-1.4 atkmm-1.6])
-GTKMM_ARG_ENABLE_API_MAEMO_EXTENSIONS
MM_ARG_DISABLE_DEPRECATED_API([GDKMM GTKMM])
MM_ARG_ENABLE_DOCUMENTATION
diff --git a/gtk/gtkmmconfig.h.in b/gtk/gtkmmconfig.h.in
index 2476f54..c9faf25 100644
--- a/gtk/gtkmmconfig.h.in
+++ b/gtk/gtkmmconfig.h.in
@@ -9,9 +9,6 @@
/* Define to omit deprecated API from gtkmm. */
#undef GTKMM_DISABLE_DEPRECATED
-/* Defined when the --enable-maemo-extensions configure argument was given */
-#undef GTKMM_MAEMO_EXTENSIONS_ENABLED
-
/* Major version number of gtkmm. */
#undef GTKMM_MAJOR_VERSION
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index c3d7024..8df1ac4 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -22,8 +22,6 @@
#include <glibmm/value.h>
#include <gtk/gtk.h>
-#include <gtkmmconfig.h> //For GTKMM_MAEMO_EXTENSIONS_ENABLED
-
_DEFS(gtkmm,gtk)
@@ -106,17 +104,6 @@ _WRAP_ENUM(RegionFlags, GtkRegionFlags)
_WRAP_ENUM(JunctionSides, GtkJunctionSides)
_WRAP_ENUM(StateFlags, GtkStateFlags)
-#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
-namespace Hildon
-{
-
-#m4 dnl // TODO: Get the get_type stuff to work
-_WRAP_ENUM(SizeType, HildonSizeType, NO_GTYPE)
-_WRAP_ENUM(InputMode, HildonGtkInputMode, s#^GTK_##, NO_GTYPE)
-
-} // namespace Hildon
-#endif /* GTKMM_MAEMO_EXTENSIONS_ENABLED */
-
/* We use a class to implement the GtkIconSize enum, because you can register
* new "enum" values. The strict type rules of C++ don't allow using an enum
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index c29fbdb..fefa5bd 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -3,9 +3,7 @@
gtkmm_files_defs = \
gtk.defs \
gtk_enums.defs \
- gtk_enums_maemo.defs \
gtk_methods.defs \
- gtk_methods_maemo.defs \
gtk_extra_objects.defs \
gtk_other.defs \
gtk_signals.defs \
diff --git a/gtk/src/gtk.defs b/gtk/src/gtk.defs
index 4f5bf85..8c08220 100644
--- a/gtk/src/gtk.defs
+++ b/gtk/src/gtk.defs
@@ -1,8 +1,6 @@
(include gtk_methods.defs)
-(include gtk_methods_maemo.defs)
(include gtk_extra_objects.defs)
(include gtk_signals.defs)
(include gtk_vfuncs.defs)
(include gtk_enums.defs)
-(include gtk_enums_maemo.defs)
(include gtk_other.defs)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]