X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524cb04066186fd955c59a721575397b978192c0..76b92fa5c75d542c44dcccd551e432fbad660fda:/configure

diff --git a/configure b/configure
index c5ac0eb5bf..89cb43b172 100755
--- a/configure
+++ b/configure
@@ -1804,7 +1804,6 @@ Optional Features:
   --enable-graphics_ctx   use graphics context 2D drawing API
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
-  --enable-metafile       use win32 metafiles
   --disable-controls      disable compilation of all standard controls
   --enable-markup         support wxControl::SetLabelMarkup
   --enable-accel          use accelerators
@@ -1896,8 +1895,9 @@ Optional Features:
   --enable-mousewheel     use mousewheel
   --enable-validators     use wxValidator and derived classes
   --enable-busyinfo       use wxBusyInfo
+  --enable-hotkey         use wxWindow::RegisterHotKey()
   --enable-joystick       use wxJoystick
-  --enable-metafiles      use wxMetaFile (Win32 only)
+  --enable-metafiles      use wxMetaFile
   --enable-dragimage      use wxDragImage
   --enable-accessibility  enable accessibility support
   --enable-uiactionsim    use wxUIActionSimulator (experimental)
@@ -2996,6 +2996,8 @@ DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_OPENGL=auto
 DEFAULT_wxUSE_MEDIACTRL=auto
 DEFAULT_wxUSE_COMPILER_TLS=auto
+DEFAULT_wxUSE_HOTKEY=auto
+DEFAULT_wxUSE_METAFILE=auto
 
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
@@ -9761,50 +9763,6 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
-          # Check whether --enable-metafile was given.
-if test "${enable_metafile+set}" = set; then
-  enableval=$enable_metafile;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_metafile='wxUSE_METAFILE=yes'
-                          else
-                            wx_cv_use_metafile='wxUSE_METAFILE=no'
-                          fi
-
-else
-
-                          wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_metafile"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_METAFILE = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$wxUSE_METAFILE
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
 
 DEFAULT_wxUSE_CONTROLS=none
 
@@ -13880,6 +13838,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hotkey" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-hotkey... $ECHO_C" >&6; }
+          # Check whether --enable-hotkey was given.
+if test "${enable_hotkey+set}" = set; then
+  enableval=$enable_hotkey;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_hotkey='wxUSE_HOTKEY=yes'
+                          else
+                            wx_cv_use_hotkey='wxUSE_HOTKEY=no'
+                          fi
+
+else
+
+                          wx_cv_use_hotkey='wxUSE_HOTKEY=${'DEFAULT_wxUSE_HOTKEY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_hotkey"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_HOTKEY = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_HOTKEY
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -45123,6 +45125,24 @@ _ACEOF
 
 fi
 
+if test "$wxUSE_HOTKEY" = "yes"; then
+  if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1 -a "$wxUSE_OSX_CARBON" != 1; then
+    { echo "$as_me:$LINENO: WARNING: Hot keys not supported by the current toolkit, disabled" >&5
+echo "$as_me: WARNING: Hot keys not supported by the current toolkit, disabled" >&2;}
+    wxUSE_HOTKEY=no
+  fi
+elif test "$wxUSE_HOTKEY" = "auto"; then
+  if test "$wxUSE_MSW" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OSX_CARBON" = 1; then
+    wxUSE_HOTKEY=yes
+  fi
+fi
+if test "$wxUSE_HOTKEY" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_HOTKEY 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_STD_CONTAINERS" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_STD_CONTAINERS 1
@@ -47056,6 +47076,23 @@ if test "$wxUSE_METAFILE" = "yes"; then
 echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;}
         wxUSE_METAFILE=no
     fi
+elif test "$wxUSE_METAFILE" = "auto"; then
+    if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then
+        wxUSE_METAFILE=yes
+    fi
+fi
+
+if test "$wxUSE_METAFILE" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_METAFILE 1
+_ACEOF
+
+    if test "$wxUSE_MSW" = 1; then
+                cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ENH_METAFILE 1
+_ACEOF
+
+    fi
 fi
 
 
@@ -47192,18 +47229,6 @@ echo "$as_me: WARNING: Some features disabled because OLE headers not found" >&2
         wxUSE_DATAOBJ=no
         wxUSE_OLE=no
     fi
-
-    if test "$wxUSE_METAFILE" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_METAFILE 1
-_ACEOF
-
-
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ENH_METAFILE 1
-_ACEOF
-
-    fi
 fi
 
 if test "$wxUSE_IPC" = "yes"; then
@@ -48197,13 +48222,6 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
 fi
 
-if test "$wxUSE_METAFILE" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_METAFILE 1
-_ACEOF
-
-fi
-
 if test "$wxUSE_MIMETYPE" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_MIMETYPE 1