Added documentation for wxPGEditor::SetControlAppearance()

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 5335cc837f005a5d6d466ebb393077d7539657c2..8e492ad25a800deb4b947e7bdb55657e938d8ac8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1919,9 +1919,11 @@ Optional Packages:
   --with-motif            use Motif/Lesstif
   --with-osx_carbon       use Mac OS X (Carbon)
   --with-osx_cocoa        use Mac OS X (Cocoa)
   --with-motif            use Motif/Lesstif
   --with-osx_carbon       use Mac OS X (Carbon)
   --with-osx_cocoa        use Mac OS X (Cocoa)

+  --with-osx_iphone       use iPhone OS X port

   --with-osx              use Mac OS X (default port, currently Carbon)
   --with-carbon           same as --with-osx_carbon
   --with-cocoa            same as --with-osx_cocoa
   --with-osx              use Mac OS X (default port, currently Carbon)
   --with-carbon           same as --with-osx_carbon
   --with-cocoa            same as --with-osx_cocoa

+  --with-iphone           same as --with-osx_iphone

   --with-mac              same as --with-osx
   --with-old_cocoa        use old, deprecated, Cocoa port
   --with-wine             use Wine
   --with-mac              same as --with-osx
   --with-old_cocoa        use old, deprecated, Cocoa port
   --with-wine             use Wine


@@ -2608,12 +2610,13 @@ USE_ALPHA=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 

-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB"

 
 DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_wxUSE_OSX_COCOA=0
 
 DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_wxUSE_OSX_COCOA=0

+DEFAULT_wxUSE_OSX_IPHONE=0

 DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0


@@ -2626,6 +2629,7 @@ DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0

+DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0

 DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0


@@ -2890,6 +2894,20 @@ _ACEOF
     DEFAULT_STD_FLAG=no
   ;;
 
     DEFAULT_STD_FLAG=no
   ;;
 

+  arm-apple-darwin*)
+        USE_BSD=1
+    USE_DARWIN=1
+    cat >>confdefs.h <<\_ACEOF
+#define __BSD__ 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define __DARWIN__ 1
+_ACEOF
+
+    DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1
+  ;;
+

   *-*-darwin* )
         USE_BSD=1
     USE_DARWIN=1
   *-*-darwin* )
         USE_BSD=1
     USE_DARWIN=1


@@ -3327,6 +3345,12 @@ if test "${with_osx_cocoa+set}" = set; then
 fi
 
 
 fi
 
 

+# Check whether --with-osx_iphone was given.
+if test "${with_osx_iphone+set}" = set; then
+  withval=$with_osx_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1
+fi
+
+

 # Check whether --with-osx was given.
 if test "${with_osx+set}" = set; then
   withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
 # Check whether --with-osx was given.
 if test "${with_osx+set}" = set; then
   withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1


@@ -3345,6 +3369,12 @@ if test "${with_cocoa+set}" = set; then
 fi
 
 
 fi
 
 

+# Check whether --with-iphone was given.
+if test "${with_iphone+set}" = set; then
+  withval=$with_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1
+fi
+
+

 # Check whether --with-mac was given.
 if test "${with_mac+set}" = set; then
   withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
 # Check whether --with-mac was given.
 if test "${with_mac+set}" = set; then
   withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1


@@ -3540,7 +3570,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
     fi
 
             NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
     fi
 
             NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \

-                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \

                   + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
 
         case "${host}" in
                   + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
 
         case "${host}" in


@@ -3589,7 +3619,9 @@ echo "${ECHO_T}base only" >&6; }
 fi
 
 wxUSE_MAC=0
 fi
 
 wxUSE_MAC=0

-if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
+if test "$wxUSE_OSX_CARBON" = 1 \
+       -o "$wxUSE_OSX_COCOA" = 1 \
+       -o "$wxUSE_OSX_IPHONE" = 1; then

     wxUSE_MAC=1
 fi
 
     wxUSE_MAC=1
 fi
 


@@ -28482,7 +28514,7 @@ fi
 
 
             case "${host}" in
 
 
             case "${host}" in

-       x86_64-*-mingw32* )
+        x86_64-*-mingw32* )

                         LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
 
                                                 WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
                         LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
 
                                                 WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"


@@ -33021,6 +33053,10 @@ echo "${ECHO_T}none" >&6; }
                 TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
     fi
 
                 TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
     fi
 

+    if test "$wxUSE_OSX_IPHONE" = 1; then
+        TOOLKIT=OSX_IPHONE
+    fi
+

     if test "$wxUSE_OLD_COCOA" = 1; then
         TOOLKIT=COCOA
         GUIDIST=COCOA_DIST
     if test "$wxUSE_OLD_COCOA" = 1; then
         TOOLKIT=COCOA
         GUIDIST=COCOA_DIST


@@ -47988,19 +48024,7 @@ fi
 
 
 
 
 
 

-TOOLKIT_LOWERCASE=xxx
-if test "$TOOLKIT" = "MAC"; then
-    TOOLKIT_LOWERCASE=osx_carbon
-fi
-if test "$TOOLKIT" = "OSX_CARBON"; then
-    TOOLKIT_LOWERCASE=osx_carbon
-fi
-if test "$TOOLKIT" = "OSX_COCOA"; then
-    TOOLKIT_LOWERCASE=osx_cocoa
-fi
-if test "$TOOLKIT_LOWERCASE" = "xxx"; then
-    TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
-fi
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`