From 5f75b7506fd1b5753496030984f9395e44f99a10 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Wed, 26 Aug 2015 22:27:59 +0200 Subject: [PATCH] Remove Hildon framework support. The Hildon framework was used for Nokia 770 and other Maemo devices. This platform discontinued and hasn't seen a new release since 2011. --- Makefile.in | 28 +-- build/bakefiles/files.bkl | 2 - build/bakefiles/make_dist.mk | 5 - build/files | 2 - configure | 247 ------------------------ configure.in | 42 ---- docs/doxygen/mainpages/const_wxusedef.h | 1 - include/wx/gtk/app.h | 13 -- include/wx/gtk/frame.h | 5 - include/wx/gtk/hildon/notifmsg.h | 58 ------ include/wx/notifmsg.h | 2 - setup.h.in | 8 - setup.h_vms | 8 - src/generic/notifmsgg.cpp | 16 +- src/gtk/app.cpp | 25 --- src/gtk/checklst.cpp | 4 - src/gtk/colordlg.cpp | 65 ------- src/gtk/display.cpp | 8 - src/gtk/frame.cpp | 20 -- src/gtk/hildon/notifmsg.cpp | 131 ------------- src/gtk/menu.cpp | 39 ---- src/gtk/msgdlg.cpp | 54 +----- src/gtk/toplevel.cpp | 44 ----- 23 files changed, 6 insertions(+), 821 deletions(-) delete mode 100644 include/wx/gtk/hildon/notifmsg.h delete mode 100644 src/gtk/hildon/notifmsg.cpp diff --git a/Makefile.in b/Makefile.in index f7ee647b69..2901e1a93d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3763,8 +3763,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR = \ $(ADVANCED_GTK_PLATFORM_HDR) \ wx/gtk/notifmsg.h \ wx/gtk/taskbar.h \ - wx/generic/activityindicator.h \ - wx/gtk/hildon/notifmsg.h + wx/generic/activityindicator.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_ADVANCED_PLATFORM_HDR = \ $(ADVANCED_GTK_PLATFORM_HDR) \ @@ -6587,7 +6586,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_gtk_notifmsg.o \ monodll_gtk_taskbar.o \ monodll_gtk_eggtrayicon.o \ - monodll_hildon_notifmsg.o \ monodll_generic_activityindicator.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___ADVANCED_PLATFORM_SRC_OBJECTS = \ @@ -6735,7 +6733,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monodll_gtk_notifmsg.o \ monodll_gtk_taskbar.o \ monodll_gtk_eggtrayicon.o \ - monodll_hildon_notifmsg.o \ monodll_generic_activityindicator.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @@ -8961,7 +8958,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ monolib_gtk_notifmsg.o \ monolib_gtk_taskbar.o \ monolib_gtk_eggtrayicon.o \ - monolib_hildon_notifmsg.o \ monolib_generic_activityindicator.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ @@ -9109,7 +9105,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ monolib_gtk_notifmsg.o \ monolib_gtk_taskbar.o \ monolib_gtk_eggtrayicon.o \ - monolib_hildon_notifmsg.o \ monolib_generic_activityindicator.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @@ -13335,7 +13330,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \ advdll_gtk_notifmsg.o \ advdll_gtk_taskbar.o \ advdll_gtk_eggtrayicon.o \ - advdll_hildon_notifmsg.o \ advdll_generic_activityindicator.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_4) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \ @@ -13483,7 +13477,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \ advdll_gtk_notifmsg.o \ advdll_gtk_taskbar.o \ advdll_gtk_eggtrayicon.o \ - advdll_hildon_notifmsg.o \ advdll_generic_activityindicator.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_5) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \ @@ -13684,7 +13677,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \ advlib_gtk_notifmsg.o \ advlib_gtk_taskbar.o \ advlib_gtk_eggtrayicon.o \ - advlib_hildon_notifmsg.o \ advlib_generic_activityindicator.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_6) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \ @@ -13832,7 +13824,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \ advlib_gtk_notifmsg.o \ advlib_gtk_taskbar.o \ advlib_gtk_eggtrayicon.o \ - advlib_hildon_notifmsg.o \ advlib_generic_activityindicator.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_7) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \ @@ -23180,9 +23171,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c @@ -29102,9 +29090,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c @@ -39539,9 +39524,6 @@ advdll_addremovectrl.o: $(srcdir)/src/common/addremovectrl.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CCC) -c -o $@ $(ADVDLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CCC) -c -o $@ $(ADVDLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c @@ -40064,9 +40046,6 @@ advlib_addremovectrl.o: $(srcdir)/src/common/addremovectrl.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CCC) -c -o $@ $(ADVLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CCC) -c -o $@ $(ADVLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c @@ -41698,11 +41677,6 @@ GTK_DIST: UNIV_DIST $(CP_P) $(INCDIR)/wx/gtk/gnome/*.h $(DISTDIR)/include/wx/gtk/gnome $(CP_P) $(GTKDIR)/gnome/*.cpp $(DISTDIR)/src/gtk/gnome - mkdir $(DISTDIR)/include/wx/gtk/hildon - mkdir $(DISTDIR)/src/gtk/hildon - $(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon - $(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon - mkdir $(DISTDIR)/src/osx mkdir $(DISTDIR)/src/osx/core $(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 8222b9cdbe..89e579c58a 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3202,7 +3202,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(ADVANCED_GTK_SRC) src/gtk/eggtrayicon.c - src/gtk/hildon/notifmsg.cpp src/generic/activityindicator.cpp @@ -3213,7 +3212,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(ADVANCED_GTK_HDR) - wx/gtk/hildon/notifmsg.h diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 8067c341ab..9f79a81681 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -353,11 +353,6 @@ GTK_DIST: UNIV_DIST $(CP_P) $(INCDIR)/wx/gtk/gnome/*.h $(DISTDIR)/include/wx/gtk/gnome $(CP_P) $(GTKDIR)/gnome/*.cpp $(DISTDIR)/src/gtk/gnome - mkdir $(DISTDIR)/include/wx/gtk/hildon - mkdir $(DISTDIR)/src/gtk/hildon - $(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon - $(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon - mkdir $(DISTDIR)/src/osx mkdir $(DISTDIR)/src/osx/core $(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core diff --git a/build/files b/build/files index 143cd1316d..fe6889aa60 100644 --- a/build/files +++ b/build/files @@ -2758,7 +2758,6 @@ ADVANCED_GTK2_SRC = $(ADVANCED_GTK_SRC) src/generic/activityindicator.cpp src/gtk/eggtrayicon.c - src/gtk/hildon/notifmsg.cpp ADVANCED_GTK_HDR = $(ADVANCED_GTK_PLATFORM_HDR) wx/generic/activityindicator.h @@ -2766,7 +2765,6 @@ ADVANCED_GTK_HDR = wx/gtk/taskbar.h ADVANCED_GTK2_HDR = $(ADVANCED_GTK_HDR) - wx/gtk/hildon/notifmsg.h ADVANCED_GTK_NATIVE_SRC = src/gtk/aboutdlg.cpp diff --git a/configure b/configure index abbe5566e8..3508035452 100755 --- a/configure +++ b/configure @@ -954,10 +954,6 @@ WEBKIT_LIBS WEBKIT_CFLAGS COND_PYTHON PYTHON -HILDON2_LIBS -HILDON2_CFLAGS -HILDON_LIBS -HILDON_CFLAGS LIBNOTIFY_LIBS LIBNOTIFY_CFLAGS GNOMEVFS_LIBS @@ -1104,7 +1100,6 @@ with_libmspack with_gtkprint with_gnomevfs with_libnotify -with_hildon with_opengl with_dmalloc with_sdl @@ -1408,10 +1403,6 @@ GNOMEVFS_CFLAGS GNOMEVFS_LIBS LIBNOTIFY_CFLAGS LIBNOTIFY_LIBS -HILDON_CFLAGS -HILDON_LIBS -HILDON2_CFLAGS -HILDON2_LIBS WEBKIT_CFLAGS WEBKIT_LIBS CAIRO_CFLAGS @@ -2332,7 +2323,6 @@ Optional Packages: --without-gtkprint don't use GTK printing support --with-gnomevfs use GNOME VFS for associating MIME types --with-libnotify use libnotify for notifications - --with-hildon use Hildon framework for Nokia 770/800/810 --with-opengl use OpenGL (or Mesa) --with-dmalloc use dmalloc library (http://dmalloc.com/) --with-sdl use SDL for audio on Unix @@ -2405,13 +2395,6 @@ Some influential environment variables: C compiler flags for LIBNOTIFY, overriding pkg-config LIBNOTIFY_LIBS linker flags for LIBNOTIFY, overriding pkg-config - HILDON_CFLAGS - C compiler flags for HILDON, overriding pkg-config - HILDON_LIBS linker flags for HILDON, overriding pkg-config - HILDON2_CFLAGS - C compiler flags for HILDON2, overriding pkg-config - HILDON2_LIBS - linker flags for HILDON2, overriding pkg-config WEBKIT_CFLAGS C compiler flags for WEBKIT, overriding pkg-config WEBKIT_LIBS linker flags for WEBKIT, overriding pkg-config @@ -4077,8 +4060,6 @@ DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_LIBGNOMEVFS=no -DEFAULT_wxUSE_LIBHILDON=no -DEFAULT_wxUSE_LIBHILDON2=no DEFAULT_wxUSE_LIBMSPACK=no DEFAULT_wxUSE_LIBSDL=no @@ -5287,50 +5268,6 @@ fi $as_echo "$result" >&6; } - withstring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$withstring" = xwithout; then - defaultval=yes - else - defaultval=no - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-hildon" >&5 -$as_echo_n "checking for --${withstring:-with}-hildon... " >&6; } - -# Check whether --with-hildon was given. -if test "${with_hildon+set}" = set; then : - withval=$with_hildon; - if test "$withval" = yes; then - wx_cv_use_hildon='wxUSE_LIBHILDON=yes' - else - wx_cv_use_hildon='wxUSE_LIBHILDON=no' - fi - -else - - wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}" - -fi - - - eval "$wx_cv_use_hildon" - - if test x"$withstring" = xwithout; then - if test $wxUSE_LIBHILDON = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_LIBHILDON - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 -$as_echo "$result" >&6; } - - withstring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -34349,184 +34286,6 @@ fi fi fi - if test "$wxUSE_LIBHILDON" = "yes" ; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON" >&5 -$as_echo_n "checking for HILDON... " >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$HILDON_CFLAGS"; then - pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-lgpl >= 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "hildon-lgpl >= 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-lgpl >= 0.9" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$HILDON_LIBS"; then - pkg_cv_HILDON_LIBS="$HILDON_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-lgpl >= 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "hildon-lgpl >= 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-lgpl >= 0.9" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-lgpl >= 0.9"` - else - HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-lgpl >= 0.9"` - fi - # Put the nasty error message in config.log where it belongs - echo "$HILDON_PKG_ERRORS" >&5 - - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libhildon_lgpl not found" >&5 -$as_echo "$as_me: WARNING: libhildon_lgpl not found" >&2;} - wxUSE_LIBHILDON="no" - ac_hildon_lgpl=0 - - -elif test $pkg_failed = untried; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libhildon_lgpl not found" >&5 -$as_echo "$as_me: WARNING: libhildon_lgpl not found" >&2;} - wxUSE_LIBHILDON="no" - ac_hildon_lgpl=0 - - -else - HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS - HILDON_LIBS=$pkg_cv_HILDON_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON_LIBS" - CFLAGS="$CFLAGS $HILDON_CFLAGS" - CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS" - $as_echo "#define wxUSE_LIBHILDON 1" >>confdefs.h - - ac_hildon_lgpl=1 - -fi - - if test "$ac_hildon_lgpl" = 0 ; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON2" >&5 -$as_echo_n "checking for HILDON2... " >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$HILDON2_CFLAGS"; then - pkg_cv_HILDON2_CFLAGS="$HILDON2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\""; } >&5 - ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_HILDON2_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 1.99" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$HILDON2_LIBS"; then - pkg_cv_HILDON2_LIBS="$HILDON2_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\""; } >&5 - ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_HILDON2_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 1.99" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - HILDON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 1.99"` - else - HILDON2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 1.99"` - fi - # Put the nasty error message in config.log where it belongs - echo "$HILDON2_PKG_ERRORS" >&5 - - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libhildon_1 not found" >&5 -$as_echo "$as_me: WARNING: libhildon_1 not found" >&2;} - wxUSE_LIBHILDON2="no" - - -elif test $pkg_failed = untried; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libhildon_1 not found" >&5 -$as_echo "$as_me: WARNING: libhildon_1 not found" >&2;} - wxUSE_LIBHILDON2="no" - - -else - HILDON2_CFLAGS=$pkg_cv_HILDON2_CFLAGS - HILDON2_LIBS=$pkg_cv_HILDON2_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON2_LIBS" - CFLAGS="$CFLAGS $HILDON2_CFLAGS" - CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS" - $as_echo "#define wxUSE_LIBHILDON2 1" >>confdefs.h - - -fi - fi - fi fi if test "$wxUSE_CMDLINE_PARSER" = "yes"; then @@ -37640,12 +37399,6 @@ case "$TOOLKIT" in if test "$wxUSE_LIBNOTIFY" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA libnotify" fi - if test "$wxUSE_LIBHILDON" = "yes"; then - TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon" - fi - if test "$wxUSE_LIBHILDON2" = "yes"; then - TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon" - fi if test "$TOOLKIT_EXTRA" != ""; then TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`" diff --git a/configure.in b/configure.in index ab9ea76685..fbc29147a8 100644 --- a/configure.in +++ b/configure.in @@ -331,8 +331,6 @@ DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG dnl libraries disabled by default DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_LIBGNOMEVFS=no -DEFAULT_wxUSE_LIBHILDON=no -DEFAULT_wxUSE_LIBHILDON2=no DEFAULT_wxUSE_LIBMSPACK=no DEFAULT_wxUSE_LIBSDL=no @@ -544,7 +542,6 @@ WX_ARG_WITH(libmspack, [ --with-libmspack use libmspack (CHM help fi WX_ARG_WITHOUT(gtkprint, [ --without-gtkprint don't use GTK printing support], wxUSE_GTKPRINT) WX_ARG_WITH(gnomevfs, [ --with-gnomevfs use GNOME VFS for associating MIME types], wxUSE_LIBGNOMEVFS) WX_ARG_WITH(libnotify, [ --with-libnotify use libnotify for notifications], wxUSE_LIBNOTIFY) -WX_ARG_WITH(hildon, [ --with-hildon use Hildon framework for Nokia 770/800/810], wxUSE_LIBHILDON) WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL) fi @@ -5497,39 +5494,6 @@ if test "$WXGTK2" = 1; then fi fi - if test "$wxUSE_LIBHILDON" = "yes" ; then - PKG_CHECK_MODULES(HILDON, - [hildon-lgpl >= 0.9], - [ - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON_LIBS" - CFLAGS="$CFLAGS $HILDON_CFLAGS" - CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS" - AC_DEFINE(wxUSE_LIBHILDON) - ac_hildon_lgpl=1 - ], - [ - AC_MSG_WARN([libhildon_lgpl not found]) - wxUSE_LIBHILDON="no" - ac_hildon_lgpl=0 - ] - ) - - if test "$ac_hildon_lgpl" = 0 ; then - PKG_CHECK_MODULES(HILDON2, - [hildon-1 >= 1.99], - [ - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON2_LIBS" - CFLAGS="$CFLAGS $HILDON2_CFLAGS" - CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS" - AC_DEFINE(wxUSE_LIBHILDON2) - ], - [ - AC_MSG_WARN([libhildon_1 not found]) - wxUSE_LIBHILDON2="no" - ] - ) - fi - fi fi if test "$wxUSE_CMDLINE_PARSER" = "yes"; then @@ -7779,12 +7743,6 @@ case "$TOOLKIT" in if test "$wxUSE_LIBNOTIFY" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA libnotify" fi - if test "$wxUSE_LIBHILDON" = "yes"; then - TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon" - fi - if test "$wxUSE_LIBHILDON2" = "yes"; then - TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon" - fi if test "$TOOLKIT_EXTRA" != ""; then TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`" diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h index a0ea2cf251..a01a8c549c 100644 --- a/docs/doxygen/mainpages/const_wxusedef.h +++ b/docs/doxygen/mainpages/const_wxusedef.h @@ -284,7 +284,6 @@ library: @itemdef{wxUSE_DETECT_SM, Use code to detect X11 session manager.} @itemdef{wxUSE_GTKPRINT, Use GTK+ printing support.} @itemdef{wxUSE_LIBGNOMEVFS, Use GNOME VFS support. Currently has no effect. } -@itemdef{wxUSE_LIBHILDON, Use Hildon framework for Nokia 770. Currently has no effect. } @endDefList diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index 6db7b43f99..2682515592 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -13,10 +13,6 @@ // classes //----------------------------------------------------------------------------- -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 -typedef struct _HildonProgram HildonProgram; -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - //----------------------------------------------------------------------------- // wxApp //----------------------------------------------------------------------------- @@ -62,11 +58,6 @@ public: // various bugs arising due to this. static bool GTKIsUsingGlobalMenu(); -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // Maemo-specific method: get the main program object - HildonProgram *GetHildonProgram(); -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // implementation only from now on // ------------------------------- @@ -83,10 +74,6 @@ private: #endif unsigned m_idleSourceId; -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - HildonProgram *m_hildonProgram; -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - wxDECLARE_DYNAMIC_CLASS(wxApp); }; diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index a7ddaa8e8a..878ba99732 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -50,11 +50,6 @@ public: virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; wxPoint GetClientAreaOrigin() const wxOVERRIDE { return wxPoint(0, 0); } -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // in Hildon environment all frames are always shown maximized - virtual bool IsMaximized() const { return true; } -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // implementation from now on // -------------------------- diff --git a/include/wx/gtk/hildon/notifmsg.h b/include/wx/gtk/hildon/notifmsg.h deleted file mode 100644 index ade115fe8a..0000000000 --- a/include/wx/gtk/hildon/notifmsg.h +++ /dev/null @@ -1,58 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/hildon/notifmsg.h -// Purpose: Hildon implementation of wxNotificationMessage -// Author: Vadim Zeitlin -// Created: 2007-11-21 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_HILDON_NOTIFMSG_H_ -#define _WX_GTK_HILDON_NOTIFMSG_H_ - -typedef struct _HildonBanner HildonBanner; - -// ---------------------------------------------------------------------------- -// wxNotificationMessage -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxNotificationMessage : public wxNotificationMessageBase -{ -public: - wxNotificationMessage() { Init(); } - wxNotificationMessage(const wxString& title, - const wxString& message = wxString(), - wxWindow *parent = NULL) - : wxNotificationMessageBase(title, message, parent) - { - Init(); - } - - virtual ~wxNotificationMessage(); - - - virtual bool Show(int timeout = Timeout_Auto); - virtual bool Close(); - -private: - void Init() { m_banner = NULL; } - - // return the string containing markup for both the title and, if - // specified, the message - wxString HildonGetMarkup() const; - - // returns the widget of the parent GtkWindow to use or NULL - GtkWidget *HildonGetWindow() const; - - - // the banner we're showing, only non-NULL if it's an animation or progress - // banner as the informational dialog times out on its own and we don't - // need to store it (nor do we have any way to get its widget anyhow) - GtkWidget *m_banner; - - - wxDECLARE_NO_COPY_CLASS(wxNotificationMessage); -}; - -#endif // _WX_GTK_HILDON_NOTIFMSG_H_ - diff --git a/include/wx/notifmsg.h b/include/wx/notifmsg.h index fe49c8763c..a5298f8c45 100644 --- a/include/wx/notifmsg.h +++ b/include/wx/notifmsg.h @@ -132,8 +132,6 @@ private: */ #if defined(__WXGTK__) && wxUSE_LIBNOTIFY #include "wx/gtk/notifmsg.h" -#elif defined(__WXGTK__) && (wxUSE_LIBHILDON || wxUSE_LIBHILDON2) - #include "wx/gtk/hildon/notifmsg.h" #elif defined(__WXMSW__) && wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS #include "wx/msw/notifmsg.h" #else diff --git a/setup.h.in b/setup.h.in index d9af56147b..f1377460d5 100644 --- a/setup.h.in +++ b/setup.h.in @@ -810,14 +810,6 @@ * Use GNOME VFS for MIME types */ #define wxUSE_LIBGNOMEVFS 0 -/* - * Use the Hildon framework - */ -#define wxUSE_LIBHILDON 0 -/* - * Use the Hildon 2.0 framework - */ -#define wxUSE_LIBHILDON2 0 /* * Use libnotify library. */ diff --git a/setup.h_vms b/setup.h_vms index 28224912ac..9c9e94b577 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -882,14 +882,6 @@ typedef pid_t GPid; * Use GNOME VFS for MIME types */ #define wxUSE_LIBGNOMEVFS 0 -/* - * Use the Hildon framework - */ -#define wxUSE_LIBHILDON 0 -/* - * Use the Hildon 2.0 framework - */ -#define wxUSE_LIBHILDON2 0 #define wxUSE_DC_TRANSFORM_MATRIX 1 diff --git a/src/generic/notifmsgg.cpp b/src/generic/notifmsgg.cpp index 01329c05ea..3118c3be6a 100644 --- a/src/generic/notifmsgg.cpp +++ b/src/generic/notifmsgg.cpp @@ -22,15 +22,7 @@ #pragma hdrstop #endif -#ifndef wxUSE_LIBHILDON - #define wxUSE_LIBHILDON 0 -#endif - -#ifndef wxUSE_LIBHILDON2 - #define wxUSE_LIBHILDON2 0 -#endif - -#if wxUSE_NOTIFICATION_MESSAGE && (!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2) +#if wxUSE_NOTIFICATION_MESSAGE #ifndef WX_PRECOMP #include "wx/dialog.h" @@ -42,8 +34,8 @@ #include "wx/artprov.h" // even if the platform has the native implementation, we still normally want -// to use the generic one (unless it's totally unsuitable for the target UI as -// is the case of Hildon) because it may provide more features, so include +// to use the generic one (unless it's totally unsuitable for the target UI) +// because it may provide more features, so include // wx/generic/notifmsg.h to get wxGenericNotificationMessage declaration even // if wx/notifmsg.h only declares wxNotificationMessage itself (if it already // uses the generic version, the second inclusion will do no harm) @@ -241,4 +233,4 @@ bool wxGenericNotificationMessage::Close() return true; } -#endif // wxUSE_NOTIFICATION_MESSAGE && (!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2) +#endif // wxUSE_NOTIFICATION_MESSAGE diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 776205a5cb..ec0827f78f 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -28,14 +28,6 @@ #include "wx/apptrait.h" #include "wx/fontmap.h" -#if wxUSE_LIBHILDON - #include -#endif // wxUSE_LIBHILDON - -#if wxUSE_LIBHILDON2 - #include -#endif // wxUSE_LIBHILDON2 - #include #include "wx/gtk/private.h" @@ -254,14 +246,6 @@ bool wxApp::OnInitGui() } #endif -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - if ( !GetHildonProgram() ) - { - wxLogError(_("Unable to initialize Hildon program")); - return false; - } -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - return true; } @@ -530,12 +514,3 @@ bool wxApp::GTKIsUsingGlobalMenu() return s_isUsingGlobalMenu == 1; } - -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 -// Maemo-specific method: get the main program object -HildonProgram *wxApp::GetHildonProgram() -{ - return hildon_program_get_instance(); -} - -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index 9c5e7065d1..ae4b3f67fa 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -83,11 +83,7 @@ void wxCheckListBox::DoCreateCheckList() gtk_tree_view_column_new_with_attributes( "", renderer, "active", 0, NULL ); -#if wxUSE_LIBHILDON2 - gtk_tree_view_column_set_fixed_width(column, 40); -#else gtk_tree_view_column_set_fixed_width(column, 22); -#endif // wxUSE_LIBHILDON2/!wxUSE_LIBHILDON2 gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_clickable(column, TRUE); diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp index 5d8932bd33..9a1603649e 100644 --- a/src/gtk/colordlg.cpp +++ b/src/gtk/colordlg.cpp @@ -28,16 +28,6 @@ #include "wx/gtk/private/gtk2-compat.h" #include "wx/gtk/private/dialogcount.h" -#if wxUSE_LIBHILDON - #include -#endif // wxUSE_LIBHILDON - -#if wxUSE_LIBHILDON2 -extern "C" { - #include -} -#endif // wxUSE_LIBHILDON2 - extern "C" { static void response(GtkDialog*, int response_id, wxColourDialog* win) { @@ -61,14 +51,8 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) GtkWindow * const parentGTK = m_parent ? GTK_WINDOW(m_parent->m_widget) : NULL; -#if wxUSE_LIBHILDON - m_widget = hildon_color_selector_new(parentGTK); -#elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON - m_widget = hildon_color_chooser_dialog_new(); -#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 wxString title(_("Choose colour")); m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title)); -#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON g_object_ref(m_widget); @@ -77,12 +61,10 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) gtk_window_set_transient_for(GTK_WINDOW(m_widget), parentGTK); } -#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 GtkColorSelection* sel = GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection( GTK_COLOR_SELECTION_DIALOG(m_widget))); gtk_color_selection_set_has_palette(sel, true); -#endif // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 return true; } @@ -103,27 +85,6 @@ int wxColourDialog::ShowModal() void wxColourDialog::ColourDataToDialog() { -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - const GdkColor * const - col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor() - : NULL; -#endif -#if wxUSE_LIBHILDON - HildonColorSelector * const sel = HILDON_COLOR_SELECTOR(m_widget); - hildon_color_selector_set_color(sel, const_cast(col)); -#elif wxUSE_LIBHILDON2 - GdkColor clr; - if (col) - clr = *col; - else { - clr.pixel = 0; - clr.red = 32768; - clr.green = 32768; - clr.blue = 32768; - } - - hildon_color_chooser_dialog_set_color((HildonColorChooserDialog *)m_widget, &clr); -#else // !wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 GtkColorSelection* sel = GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection( GTK_COLOR_SELECTION_DIALOG(m_widget))); @@ -156,35 +117,10 @@ void wxColourDialog::ColourDataToDialog() GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel)); g_object_set(settings, "gtk-color-palette", pal.c_str(), NULL); -#endif // wxUSE_LIBHILDON / wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } void wxColourDialog::DialogToColourData() { -#if wxUSE_LIBHILDON - HildonColorSelector * const sel = HILDON_COLOR_SELECTOR(m_widget); - const GdkColor * const clr = hildon_color_selector_get_color(sel); - if ( clr ) - m_data.SetColour(*clr); -#elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON - const GdkColor * const - col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor() : NULL; - - GdkColor clr; - if (col) - clr = *col; - else { - clr.pixel = 0; - clr.red = 32768; - clr.green = 32768; - clr.blue = 32768; - } - GdkColor new_color = clr; - hildon_color_chooser_dialog_get_color((HildonColorChooserDialog *)m_widget, &new_color); - - m_data.SetColour(new_color); -#else // !wxUSE_LIBHILDON2 - GtkColorSelection* sel = GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection( GTK_COLOR_SELECTION_DIALOG(m_widget))); @@ -216,7 +152,6 @@ void wxColourDialog::DialogToColourData() } g_free(pal); -#endif // wxUSE_LIBHILDON / wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } #endif // wxUSE_COLOURDLG diff --git a/src/gtk/display.cpp b/src/gtk/display.cpp index c8ce4b414a..f30e2037f7 100644 --- a/src/gtk/display.cpp +++ b/src/gtk/display.cpp @@ -24,8 +24,6 @@ GdkWindow* wxGetTopLevelGDK(); //----------------------------------------------------------------------------- -#if !(wxUSE_LIBHILDON || wxUSE_LIBHILDON2) - #ifdef GDK_WINDOWING_X11 void wxGetWorkAreaX11(Screen* screen, int& x, int& y, int& width, int& height); #endif @@ -70,19 +68,13 @@ wx_gdk_screen_get_monitor_workarea(GdkScreen* screen, int monitor, GdkRectangle* } #define gdk_screen_get_monitor_workarea wx_gdk_screen_get_monitor_workarea -#endif // !(wxUSE_LIBHILDON || wxUSE_LIBHILDON2) - void wxClientDisplayRect(int* x, int* y, int* width, int* height) { -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - GdkRectangle rect = { 0, 0, 672, 396 }; -#else GdkRectangle rect; GdkWindow* window = wxGetTopLevelGDK(); GdkScreen* screen = gdk_window_get_screen(window); int monitor = gdk_screen_get_monitor_at_window(screen, window); gdk_screen_get_monitor_workarea(screen, monitor, &rect); -#endif if (x) *x = rect.x; if (y) diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 20616f0ffb..fb448ba813 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -20,14 +20,6 @@ #include #include "wx/gtk/private/gtk2-compat.h" -#if wxUSE_LIBHILDON - #include -#endif // wxUSE_LIBHILDON - -#if wxUSE_LIBHILDON2 - #include -#endif // wxUSE_LIBHILDON2 - // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- @@ -77,9 +69,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const { int h; gtk_widget_get_preferred_height(m_frameMenuBar->m_widget, NULL, &h); -#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 *height -= h; -#endif } #endif // wxUSE_MENUS_NATIVE @@ -270,13 +260,9 @@ void wxFrame::DetachMenuBar() if ( m_frameMenuBar ) { -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL); -#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 g_object_ref( m_frameMenuBar->m_widget ); gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } wxFrameBase::DetachMenuBar(); @@ -292,11 +278,6 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) if (m_frameMenuBar) { -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - hildon_window_set_menu(HILDON_WINDOW(m_widget), - GTK_MENU(m_frameMenuBar->m_widget)); -#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 - // menubar goes into top of vbox (m_mainWidget) gtk_box_pack_start( GTK_BOX(m_mainWidget), menuBar->m_widget, false, false, 0); @@ -306,7 +287,6 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) gtk_widget_set_size_request(menuBar->m_widget, -1, -1); gtk_widget_show( m_frameMenuBar->m_widget ); -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } // make sure next size_allocate causes a wxSizeEvent m_useCachedClientSize = false; diff --git a/src/gtk/hildon/notifmsg.cpp b/src/gtk/hildon/notifmsg.cpp deleted file mode 100644 index 50c5c4ece8..0000000000 --- a/src/gtk/hildon/notifmsg.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/hildon/notifmsg.cpp -// Purpose: Hildon implementation of wxNotificationMessage -// Author: Vadim Zeitlin -// Created: 2007-11-21 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - -#ifndef WX_PRECOMP -#endif //WX_PRECOMP - -#include "wx/notifmsg.h" -#include "wx/toplevel.h" - -#if wxUSE_LIBHILDON - #include -#endif // wxUSE_LIBHILDON - -#if wxUSE_LIBHILDON2 - #include -#endif // wxUSE_LIBHILDON2 - -// ============================================================================ -// wxNotificationMessage implementation -// ============================================================================ - -wxString wxNotificationMessage::HildonGetMarkup() const -{ - const wxString& message = GetMessage(), - title = GetTitle(); - - wxString text; - if ( message.empty() ) - { - text = title; - } - else // combine title with message in a single string - { - text << "" << title << "\n" - "\n" - << message; - } - - return text; -} - -GtkWidget *wxNotificationMessage::HildonGetWindow() const -{ - wxWindow *parent = GetParent(); - if ( parent ) - { - parent = wxGetTopLevelParent(parent); - if ( parent ) - { - wxTopLevelWindow * const - tlw = wxDynamicCast(parent, wxTopLevelWindow); - if ( tlw ) - return tlw->m_mainWidget; - } - } - - return NULL; -} - -bool wxNotificationMessage::Show(int timeout) -{ - if ( timeout == Timeout_Never ) - { - m_banner = hildon_banner_show_animation - ( - HildonGetWindow(), - NULL, - GetFullMessage() // markup not supported here - ); - if ( !m_banner ) - return false; - } - else // the message will time out - { - // we don't have any way to set the timeout interval so we just let it - // time out automatically - hildon_banner_show_information_with_markup - ( - HildonGetWindow(), - NULL, - HildonGetMarkup() - ); - } - - return true; -} - -bool wxNotificationMessage::Close() -{ - if ( !m_banner ) - { - // either we hadn't been shown or we are using an information banner - // which will disappear on its own, nothing we can do about it - return false; - } - - gtk_widget_destroy(m_banner); - m_banner = NULL; - - return true; -} - -wxNotificationMessage::~wxNotificationMessage() -{ - Close(); -} - -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 1244df1723..5740187933 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -36,12 +36,6 @@ extern int wxOpenModalDialogsCount; // we use normal item but with a special id for the menu title static const int wxGTK_TITLE_ID = -3; -// forward declare it as it's used by wxMenuBar too when using Hildon -extern "C" -{ - static void menuitem_activate(GtkWidget*, wxMenuItem* item); -} - #if wxUSE_ACCEL static void wxGetGtkAccel(const wxMenuItem*, guint*, GdkModifierType*); #endif @@ -117,12 +111,6 @@ wxMenuBar::~wxMenuBar() void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style) { -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // Hildon window uses a single menu instead of a menu bar, so wxMenuBar is - // the same as menu in this case - m_widget = - m_menubar = gtk_menu_new(); -#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) || !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) { @@ -144,7 +132,6 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st } PostCreation(); -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 g_object_ref_sink(m_widget); @@ -178,10 +165,8 @@ namespace void EnsureNoGrab(GtkWidget* widget) { -#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 gtk_widget_hide(widget); gtk_grab_remove(widget); -#endif // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } void @@ -313,30 +298,6 @@ void wxMenuBar::GtkAppend(wxMenu* menu, const wxString& title, int pos) { menu->SetLayoutDirection(GetLayoutDirection()); -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // if the menu has only one item, append it directly to the top level menu - // instead of inserting a useless submenu - if ( menu->GetMenuItemCount() == 1 ) - { - wxMenuItem * const item = menu->FindItemByPosition(0); - - // remove both mnemonics and accelerator: neither is useful under Maemo - const wxString str(wxStripMenuCodes(item->GetItemLabel())); - - if ( item->IsSubMenu() ) - { - GtkAppend(item->GetSubMenu(), str, pos); - return; - } - - menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); - - g_signal_connect(menu->m_owner, "activate", - G_CALLBACK(menuitem_activate), item); - item->SetMenuItem(menu->m_owner); - } - else -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 { // This doesn't have much effect right now. menu->SetTitle( title ); diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp index e10534c15e..e9de535947 100644 --- a/src/gtk/msgdlg.cpp +++ b/src/gtk/msgdlg.cpp @@ -31,14 +31,6 @@ #include "wx/gtk/private/mnemonics.h" #include "wx/gtk/private/dialogcount.h" -#if wxUSE_LIBHILDON - #include -#endif // wxUSE_LIBHILDON - -#if wxUSE_LIBHILDON2 - #include -#endif // wxUSE_LIBHILDON2 - wxIMPLEMENT_CLASS(wxMessageDialog, wxDialog); wxMessageDialog::wxMessageDialog(wxWindow *parent, @@ -99,43 +91,6 @@ void wxMessageDialog::GTKCreateMsgDialog() { GtkWindow * const parent = m_parent ? GTK_WINDOW(m_parent->m_widget) : NULL; -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - const char *stockIcon = ""; - - switch ( GetEffectiveIcon() ) - { - case wxICON_ERROR: - stockIcon = "qgn_note_gene_syserror"; - break; - - case wxICON_WARNING: - stockIcon = "qgn_note_gene_syswarning"; - break; - - case wxICON_QUESTION: - stockIcon = "qgn_note_confirm"; - break; - - case wxICON_INFORMATION: - stockIcon = "qgn_note_info"; - break; - } - - // there is no generic note creation function in public API so we have no - // choice but to use g_object_new() directly - m_widget = (GtkWidget *)g_object_new - ( - HILDON_TYPE_NOTE, -#if wxUSE_LIBHILDON - "note_type", HILDON_NOTE_CONFIRMATION_BUTTON_TYPE, -#else // wxUSE_LIBHILDON - "note_type", HILDON_NOTE_TYPE_CONFIRMATION_BUTTON, -#endif // wxUSE_LIBHILDON /wxUSE_LIBHILDON2 - "description", (const char *)GetFullMessage().utf8_str(), - "icon", stockIcon, - NULL - ); -#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 GtkMessageType type = GTK_MESSAGE_ERROR; GtkButtonsType buttons = GTK_BUTTONS_NONE; @@ -195,7 +150,6 @@ void wxMessageDialog::GTKCreateMsgDialog() (const char *)wxGTK_CONV(m_extendedMessage) ); } -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 g_object_ref(m_widget); @@ -210,14 +164,8 @@ void wxMessageDialog::GTKCreateMsgDialog() } // we need to add buttons manually if we use custom labels or always for - // Yes/No/Cancel dialog as GTK+ doesn't support it natively and when using - // Hildon we add all the buttons manually as it doesn't support too many of - // the combinations we may have -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - static const bool addButtons = true; -#else // !wxUSE_LIBHILDON + // Yes/No/Cancel dialog as GTK+ doesn't support it natively const bool addButtons = buttons == GTK_BUTTONS_NONE; -#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON if ( addButtons ) diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 740bfab8dd..9a0e944686 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -47,15 +47,6 @@ #include "wx/gtk/private/gtk2-compat.h" #include "wx/gtk/private/win_gtk.h" -#if wxUSE_LIBHILDON - #include - #include -#endif // wxUSE_LIBHILDON - -#if wxUSE_LIBHILDON2 - #include -#endif // wxUSE_LIBHILDON2 - // ---------------------------------------------------------------------------- // data // ---------------------------------------------------------------------------- @@ -585,14 +576,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, // e.g. in wxTaskBarIconAreaGTK if (m_widget == NULL) { -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // we must create HildonWindow and not a normal GtkWindow as the latter - // doesn't look correctly in Maemo environment and it must also be - // registered with the main program object - m_widget = hildon_window_new(); - hildon_program_add_window(wxTheApp->GetHildonProgram(), - HILDON_WINDOW(m_widget)); -#else // !wxUSE_LIBHILDON || !wxUSE_LIBHILDON2 m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) { @@ -619,7 +602,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, style |= wxFRAME_NO_TASKBAR; } } -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2 g_object_ref(m_widget); } @@ -802,15 +784,6 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK() g_source_remove(m_netFrameExtentsTimerId); } -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // it can also be a (standard) dialog - if ( HILDON_IS_WINDOW(m_widget) ) - { - hildon_program_remove_window(wxTheApp->GetHildonProgram(), - HILDON_WINDOW(m_widget)); - } -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - if (m_grabbed) { wxFAIL_MSG(wxT("Window still grabbed")); @@ -1100,25 +1073,8 @@ void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const size.y -= m_decorSize.top + m_decorSize.bottom; if (size.x < 0) size.x = 0; if (size.y < 0) size.y = 0; -#if wxUSE_LIBHILDON2 - if (width) { - if (size.x == 720) - *width = 696; - else - *width = size.x; - } - if (height) { - if (size.y == 420) - *height = 396; - else if (size.y == 270) - *height = 246; - else - *height = size.y; - } -#else // wxUSE_LIBHILDON2 if (width) *width = size.x; if (height) *height = size.y; -#endif // wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON2 } void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )