2nd part of USE_xxx to wxUSE_xxx change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
47d67540a0
commit
27fc802d5c
90
configure
vendored
90
configure
vendored
@ -6080,11 +6080,11 @@ fi
|
||||
|
||||
if test "$USE_MEM_TRACING" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_MEMORY_TRACING $USE_MEM_TRACING
|
||||
#define wxUSE_MEMORY_TRACING $USE_MEM_TRACING
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_GLOBAL_MEMORY_OPERATORS $USE_MEM_TRACING
|
||||
#define wxUSE_GLOBAL_MEMORY_OPERATORS $USE_MEM_TRACING
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6123,42 +6123,42 @@ APPLE_IEEE=NONE
|
||||
if test "$USE_APPLE_IEEE" = 1 ; then
|
||||
APPLE_IEEE="APPLE_IEEE"
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_APPLE_IEEE $USE_APPLE_IEEE
|
||||
#define wxUSE_APPLE_IEEE $USE_APPLE_IEEE
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
USE_IOSTREAMH=$DEFAULT_USE_IOSTREAMH
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_IOSTREAMH $USE_IOSTREAMH
|
||||
#define wxUSE_IOSTREAMH $USE_IOSTREAMH
|
||||
EOF
|
||||
|
||||
|
||||
|
||||
if test "$USE_ZLIB" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_ZLIB $USE_ZLIB
|
||||
#define wxUSE_ZLIB $USE_ZLIB
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_GDK_IMLIB" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_GDK_IMLIB $USE_GDK_IMLIB
|
||||
#define wxUSE_GDK_IMLIB $USE_GDK_IMLIB
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_LIBPNG" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_LIBPNG $USE_LIBPNG
|
||||
#define wxUSE_LIBPNG $USE_LIBPNG
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_ODBC" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_ODBC $USE_ODBC
|
||||
#define wxUSE_ODBC $USE_ODBC
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6166,56 +6166,56 @@ fi
|
||||
|
||||
if test "$USE_GAUGE" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_GAUGE $USE_GAUGE
|
||||
#define wxUSE_GAUGE $USE_GAUGE
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_COMBOBOX" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_COMBOBOX $USE_COMBOBOX
|
||||
#define wxUSE_COMBOBOX $USE_COMBOBOX
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_SCROLLBAR" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_SCROLLBAR $USE_SCROLLBAR
|
||||
#define wxUSE_SCROLLBAR $USE_SCROLLBAR
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_LISTCTRL" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_LISTCTRL $USE_LISTCTRL
|
||||
#define wxUSE_LISTCTRL $USE_LISTCTRL
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_TREECTRL" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_TREECTRL $USE_TREECTRL
|
||||
#define wxUSE_TREECTRL $USE_TREECTRL
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_GRID" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_GRID $USE_GRID
|
||||
#define wxUSE_GRID $USE_GRID
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_TAB_DIALOG" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_TAB_DIALOG $USE_TAB_DIALOG
|
||||
#define wxUSE_TAB_DIALOG $USE_TAB_DIALOG
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_NOTEBOOK" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_NOTEBOOK $USE_NOTEBOOK
|
||||
#define wxUSE_NOTEBOOK $USE_NOTEBOOK
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6223,63 +6223,63 @@ fi
|
||||
|
||||
if test "$USE_CONFIG" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_CONFIG $USE_CONFIG
|
||||
#define wxUSE_CONFIG $USE_CONFIG
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_TIMEDATE" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_TIMEDATE $USE_TIMEDATE
|
||||
#define wxUSE_TIMEDATE $USE_TIMEDATE
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_FRACTION" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_FRACTION $USE_FRACTION
|
||||
#define wxUSE_FRACTION $USE_FRACTION
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_LOG" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_LOG $USE_LOG
|
||||
#define wxUSE_LOG $USE_LOG
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_INTL" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_INTL $USE_INTL
|
||||
#define wxUSE_INTL $USE_INTL
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_STREAMS" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_STREAMS $USE_STREAMS
|
||||
#define wxUSE_STREAMS $USE_STREAMS
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_SERIAL" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_SERIAL $USE_SERIAL
|
||||
#define wxUSE_SERIAL $USE_SERIAL
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_FILE" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_FILE $USE_FILE
|
||||
#define wxUSE_FILE $USE_FILE
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_TEXTFILE" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_TEXTFILE $USE_TEXTFILE
|
||||
#define wxUSE_TEXTFILE $USE_TEXTFILE
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6287,21 +6287,21 @@ fi
|
||||
|
||||
if test "$USE_RPC" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_RPC $USE_RPC
|
||||
#define wxUSE_RPC $USE_RPC
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_WX_RESOURCES" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_WX_RESOURCES $USE_WX_RESOURCES
|
||||
#define wxUSE_WX_RESOURCES $USE_WX_RESOURCES
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_PROLOGIO" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_PROLOGIO 1
|
||||
#define wxUSE_PROLOGIO 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6309,13 +6309,13 @@ fi
|
||||
|
||||
if test "$USE_POSTSCRIPT" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_POSTSCRIPT 1
|
||||
#define wxUSE_POSTSCRIPT 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_AFM_FOR_POSTSCRIPT $USE_AFM_FOR_POSTSCRIPT
|
||||
#define wxUSE_AFM_FOR_POSTSCRIPT $USE_AFM_FOR_POSTSCRIPT
|
||||
EOF
|
||||
|
||||
|
||||
@ -6327,21 +6327,21 @@ EOF
|
||||
|
||||
if test "$USE_MDI_ARCHITECTURE" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_MDI_ARCHITECTURE $USE_MDI_ARCHITECTURE
|
||||
#define wxUSE_MDI_ARCHITECTURE $USE_MDI_ARCHITECTURE
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_DOC_VIEW_ARCHITECTURE $USE_DOC_VIEW_ARCHITECTURE
|
||||
#define wxUSE_DOC_VIEW_ARCHITECTURE $USE_DOC_VIEW_ARCHITECTURE
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_PRINTING_ARCHITECTURE $USE_PRINTING_ARCHITECTURE
|
||||
#define wxUSE_PRINTING_ARCHITECTURE $USE_PRINTING_ARCHITECTURE
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6349,35 +6349,35 @@ fi
|
||||
|
||||
if test "$USE_IPC" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_IPC 1
|
||||
#define wxUSE_IPC 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_RESOURCES" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_RESOURCES $USE_RESOURCES
|
||||
#define wxUSE_RESOURCES $USE_RESOURCES
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_CLIPBOARD" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_CLIPBOARD $USE_CLIPBOARD
|
||||
#define wxUSE_CLIPBOARD $USE_CLIPBOARD
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_DND" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_DND $USE_DND
|
||||
#define wxUSE_DND $USE_DND
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$USE_CONSTRAINTS" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_CONSTRAINTS $USE_CONSTRAINTS
|
||||
#define wxUSE_CONSTRAINTS $USE_CONSTRAINTS
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6387,7 +6387,7 @@ METAFILE=NONE
|
||||
if test "$USE_METAFILE" = 1 ; then
|
||||
METAFILE="METAFILE"
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_METAFILE $USE_METAFILE
|
||||
#define wxUSE_METAFILE $USE_METAFILE
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6397,7 +6397,7 @@ HELP=NONE
|
||||
if test "$USE_HELP" = 1 ; then
|
||||
HELP="HELP"
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_HELP $USE_HELP
|
||||
#define wxUSE_HELP $USE_HELP
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6407,7 +6407,7 @@ WXGRAPH=NONE
|
||||
if test "$USE_WXGRAPH" = 1 ; then
|
||||
WXGRAPH="WXGRAPH"
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_WXGRAPH $USE_WXGRAPH
|
||||
#define wxUSE_WXGRAPH $USE_WXGRAPH
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6417,7 +6417,7 @@ WXTREE=NONE
|
||||
if test "$USE_WXTREE" = 1 ; then
|
||||
WXTREE="WXTREE"
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_WXTREE $USE_WXTREE
|
||||
#define wxUSE_WXTREE $USE_WXTREE
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -6679,13 +6679,13 @@ fi
|
||||
fi
|
||||
|
||||
if test -z "$UNIX_THREAD"; then
|
||||
USE_THREADS=0
|
||||
wxUSE_THREADS=0
|
||||
fi
|
||||
|
||||
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define USE_THREADS 1
|
||||
#define wxUSE_THREADS 1
|
||||
EOF
|
||||
|
||||
|
||||
@ -6809,7 +6809,7 @@ if test "$USE_OPENGL" != 1; then
|
||||
fi
|
||||
|
||||
cat >> confdefs.h <<EOF
|
||||
#define USE_GLX $USE_GLX
|
||||
#define wxUSE_GLX $USE_GLX
|
||||
EOF
|
||||
|
||||
|
||||
|
||||
24
configure.in
24
configure.in
@ -648,7 +648,7 @@ DEFAULT_USE_GTK=1
|
||||
DEFAULT_USE_QT=0
|
||||
DEFAULT_USE_MOTIF=0
|
||||
|
||||
DEFAULT_USE_THREADS=1
|
||||
DEFAULT_wxUSE_THREADS=1
|
||||
|
||||
DEFAULT_USE_SHARED=1
|
||||
DEFAULT_USE_OPTIMISE=1
|
||||
@ -938,19 +938,19 @@ dnl ----------------------------------------------------------------
|
||||
dnl
|
||||
dnl AC_OVERRIDES(metafile, metafile,
|
||||
dnl **--with-metafile use metafile (no effect),
|
||||
dnl USE_METAFILE)
|
||||
dnl wxUSE_METAFILE)
|
||||
dnl
|
||||
dnl AC_OVERRIDES(help,help,
|
||||
dnl **--with-help use help (no effect),
|
||||
dnl USE_HELP)
|
||||
dnl wxUSE_HELP)
|
||||
dnl
|
||||
dnl AC_OVERRIDES(wxgraph,wxgraph,
|
||||
dnl **--with-wxgraph use wxgraph (no effect),
|
||||
dnl USE_WXGRAPH)
|
||||
dnl wxUSE_WXGRAPH)
|
||||
dnl
|
||||
dnl AC_OVERRIDES(wxtree,wxtree,
|
||||
dnl **--with-wxtree use wxtree (no effect),
|
||||
dnl USE_WXTREE)
|
||||
dnl wxUSE_WXTREE)
|
||||
dnl
|
||||
dnl AC_OVERRIDES(package,message,helpmessage,variable)
|
||||
dnl
|
||||
@ -1320,19 +1320,19 @@ dnl ----------------------------------------------------------------
|
||||
dnl thread support
|
||||
dnl ----------------------------------------------------------------
|
||||
|
||||
USE_THREADS=1
|
||||
wxUSE_THREADS=1
|
||||
THREADS_LINK=""
|
||||
UNIX_THREAD="gtk/threadno.cpp"
|
||||
|
||||
AC_OVERRIDES(threads,threads,
|
||||
**--without-threads Force disabling threads,
|
||||
USE_THREADS)
|
||||
wxUSE_THREADS)
|
||||
|
||||
dnl AC_ARG_WITH(threads,
|
||||
dnl [**--without-threads Force disabling threads ],
|
||||
dnl [USE_THREADS="$withval"])
|
||||
dnl [wxUSE_THREADS="$withval"])
|
||||
|
||||
if test "$USE_THREADS" = "1"; then
|
||||
if test "$wxUSE_THREADS" = "1"; then
|
||||
UNIX_THREAD="gtk/threadno.cpp"
|
||||
|
||||
dnl For glibc 2 users who have the old libc 5 too
|
||||
@ -1360,16 +1360,16 @@ if test "$USE_THREADS" = "1"; then
|
||||
fi
|
||||
|
||||
if test -z "$UNIX_THREAD"; then
|
||||
USE_THREADS=0
|
||||
wxUSE_THREADS=0
|
||||
fi
|
||||
|
||||
AC_SUBST(UNIX_THREAD)
|
||||
AC_SUBST(THREADS_LINK)
|
||||
AC_DEFINE(USE_THREADS)
|
||||
AC_DEFINE(wxUSE_THREADS)
|
||||
|
||||
dnl defines UNIX_THREAD it contains the source file to use for threads. (GL)
|
||||
dnl defines THREADS_LINK it contains the thread library to link with. (GL)
|
||||
dnl defines USE_THREADS if thread support is activated. (GL)
|
||||
dnl defines wxUSE_THREADS if thread support is activated. (GL)
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl search for opengl
|
||||
|
||||
@ -42,23 +42,23 @@
|
||||
/*
|
||||
* Use zlib
|
||||
*/
|
||||
#undef USE_ZLIB
|
||||
#undef wxUSE_ZLIB
|
||||
/*
|
||||
* Use gdk_imlib
|
||||
*/
|
||||
#undef USE_GDK_IMLIB
|
||||
#undef wxUSE_GDK_IMLIB
|
||||
/*
|
||||
* Use libpng
|
||||
*/
|
||||
#undef USE_LIBPNG
|
||||
#undef wxUSE_LIBPNG
|
||||
/*
|
||||
* Use iODBC
|
||||
*/
|
||||
#undef USE_ODBC
|
||||
#undef wxUSE_ODBC
|
||||
/*
|
||||
* Use Threads
|
||||
*/
|
||||
#undef USE_THREADS
|
||||
#undef wxUSE_THREADS
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// GUI control options
|
||||
@ -67,35 +67,35 @@
|
||||
/*
|
||||
* Use gauge item
|
||||
*/
|
||||
#undef USE_GAUGE
|
||||
#undef wxUSE_GAUGE
|
||||
/*
|
||||
* Use combobox item
|
||||
*/
|
||||
#undef USE_COMBOBOX
|
||||
#undef wxUSE_COMBOBOX
|
||||
/*
|
||||
* Use scrollbar item
|
||||
*/
|
||||
#undef USE_SCROLLBAR
|
||||
#undef wxUSE_SCROLLBAR
|
||||
/*
|
||||
* Use notebook item
|
||||
*/
|
||||
#undef USE_NOTEBOOK
|
||||
#undef wxUSE_NOTEBOOK
|
||||
/*
|
||||
* Use listctrl item
|
||||
*/
|
||||
#undef USE_LISTCTRL
|
||||
#undef wxUSE_LISTCTRL
|
||||
/*
|
||||
* Use treectrl item
|
||||
*/
|
||||
#undef USE_TREECTRL
|
||||
#undef wxUSE_TREECTRL
|
||||
/*
|
||||
* Use grid item
|
||||
*/
|
||||
#undef USE_GRID
|
||||
#undef wxUSE_GRID
|
||||
/*
|
||||
* Use tab dialog item
|
||||
*/
|
||||
#undef USE_TAB_DIALOG
|
||||
#undef wxUSE_TAB_DIALOG
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// non-GUI options
|
||||
@ -104,35 +104,35 @@
|
||||
/*
|
||||
* Use fraction class
|
||||
*/
|
||||
#undef USE_FRACTION
|
||||
#undef wxUSE_FRACTION
|
||||
/*
|
||||
* Use time and date classes
|
||||
*/
|
||||
#undef USE_TIMEDATE
|
||||
#undef wxUSE_TIMEDATE
|
||||
/*
|
||||
* Use config system
|
||||
*/
|
||||
#undef USE_CONFIG
|
||||
#undef wxUSE_CONFIG
|
||||
/*
|
||||
* Use intl system
|
||||
*/
|
||||
#undef USE_INTL
|
||||
#undef wxUSE_INTL
|
||||
/*
|
||||
* Use streams
|
||||
*/
|
||||
#undef USE_STREAMS
|
||||
#undef wxUSE_STREAMS
|
||||
/*
|
||||
* Use wxFile
|
||||
*/
|
||||
#undef USE_FILE
|
||||
#undef wxUSE_FILE
|
||||
/*
|
||||
* Use wxTextFile
|
||||
*/
|
||||
#undef USE_TEXTFILE
|
||||
#undef wxUSE_TEXTFILE
|
||||
/*
|
||||
* Use class serialization
|
||||
*/
|
||||
#undef USE_SERIAL
|
||||
#undef wxUSE_SERIAL
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// PS options
|
||||
@ -142,12 +142,12 @@
|
||||
* Use font metric files in GetTextExtent for wxPostScriptDC
|
||||
* Use consistent PostScript fonts for AFM and printing (!)
|
||||
*/
|
||||
#undef USE_AFM_FOR_POSTSCRIPT
|
||||
#undef wxUSE_AFM_FOR_POSTSCRIPT
|
||||
#undef WX_NORMALIZED_PS_FONTS
|
||||
/*
|
||||
* Use PostScript device context
|
||||
*/
|
||||
#undef USE_POSTSCRIPT
|
||||
#undef wxUSE_POSTSCRIPT
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// misc options
|
||||
@ -156,23 +156,23 @@
|
||||
/*
|
||||
* Use Interprocess communication
|
||||
*/
|
||||
#undef USE_IPC
|
||||
#undef wxUSE_IPC
|
||||
/*
|
||||
* Use wxGetResource & wxWriteResource (change .Xdefaults)
|
||||
*/
|
||||
#undef USE_RESOURCES
|
||||
#undef wxUSE_RESOURCES
|
||||
/*
|
||||
* Use clipboard
|
||||
*/
|
||||
#undef USE_CLIPBOARD
|
||||
#undef wxUSE_CLIPBOARD
|
||||
/*
|
||||
* Use dnd
|
||||
*/
|
||||
#undef USE_DND
|
||||
#undef wxUSE_DND
|
||||
/*
|
||||
* Use wxWindows layout constraint system
|
||||
*/
|
||||
#undef USE_CONSTRAINTS
|
||||
#undef wxUSE_CONSTRAINTS
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// architecture options
|
||||
@ -181,15 +181,15 @@
|
||||
/*
|
||||
* Use the mdi architecture
|
||||
*/
|
||||
#undef USE_MDI_ARCHITECTURE
|
||||
#undef wxUSE_MDI_ARCHITECTURE
|
||||
/*
|
||||
* Use the document/view architecture
|
||||
*/
|
||||
#undef USE_DOC_VIEW_ARCHITECTURE
|
||||
#undef wxUSE_DOC_VIEW_ARCHITECTURE
|
||||
/*
|
||||
* Use the print/preview architecture
|
||||
*/
|
||||
#undef USE_PRINTING_ARCHITECTURE
|
||||
#undef wxUSE_PRINTING_ARCHITECTURE
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// Prolog and wxWindows' resource system options
|
||||
@ -198,15 +198,15 @@
|
||||
/*
|
||||
* Use Prolog IO
|
||||
*/
|
||||
#undef USE_PROLOGIO
|
||||
#undef wxUSE_PROLOGIO
|
||||
/*
|
||||
* Use Remote Procedure Call (Needs USE_IPC and USE_PROLOGIO)
|
||||
* Use Remote Procedure Call (Needs wxUSE_IPC and wxUSE_PROLOGIO)
|
||||
*/
|
||||
#undef USE_RPC
|
||||
#undef wxUSE_RPC
|
||||
/*
|
||||
* Use wxWindows resource loading (.wxr-files) (Needs USE_PROLOGIO 1)
|
||||
* Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
|
||||
*/
|
||||
#undef USE_WX_RESOURCES
|
||||
#undef wxUSE_WX_RESOURCES
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// the rest
|
||||
@ -217,31 +217,31 @@
|
||||
* extension to the X11 protocol. You can use the (free) Mesa library
|
||||
* if you don't have a 'real' OpenGL.
|
||||
*/
|
||||
#undef USE_GLX
|
||||
#undef wxUSE_GLX
|
||||
/*
|
||||
* Use wxWindows help facility (needs USE_IPC 1)
|
||||
* Use wxWindows help facility (needs wxUSE_IPC 1)
|
||||
*/
|
||||
#undef USE_HELP
|
||||
#undef wxUSE_HELP
|
||||
/*
|
||||
* Use iostream.h rather than iostream
|
||||
*/
|
||||
#undef USE_IOSTREAMH
|
||||
#undef wxUSE_IOSTREAMH
|
||||
/*
|
||||
* Use Metafile and Metafile device context
|
||||
*/
|
||||
#undef USE_METAFILE
|
||||
#undef wxUSE_METAFILE
|
||||
/*
|
||||
* Use wxGraph
|
||||
*/
|
||||
#undef USE_WXGRAPH
|
||||
#undef wxUSE_WXGRAPH
|
||||
/*
|
||||
* Use wxTree
|
||||
*/
|
||||
#undef USE_WXTREE
|
||||
#undef wxUSE_WXTREE
|
||||
/*
|
||||
* Use Apple Ieee-double converter
|
||||
*/
|
||||
#undef USE_APPLE_IEEE
|
||||
#undef wxUSE_APPLE_IEEE
|
||||
/* Compatibility with 1.66 API.
|
||||
Level 0: no backward compatibility, all new features
|
||||
Level 1: wxDC, OnSize (etc.) compatibility, but
|
||||
@ -256,12 +256,12 @@
|
||||
* WARNING: this code may not work with all architectures, especially
|
||||
* if alignment is an issue.
|
||||
*/
|
||||
#undef USE_MEMORY_TRACING
|
||||
#undef wxUSE_MEMORY_TRACING
|
||||
/*
|
||||
* Enable debugging version of global memory operators new and delete
|
||||
* Disable it, If this causes problems (e.g. link errors)
|
||||
*/
|
||||
#undef USE_GLOBAL_MEMORY_OPERATORS
|
||||
#undef wxUSE_GLOBAL_MEMORY_OPERATORS
|
||||
/*
|
||||
* Matthews garbage collection (used for MrEd?)
|
||||
*/
|
||||
@ -269,11 +269,11 @@
|
||||
/*
|
||||
* Use splines
|
||||
*/
|
||||
#define USE_SPLINES 1
|
||||
#define wxUSE_SPLINES 1
|
||||
/*
|
||||
* USE_DYNAMIC_CLASSES is TRUE for the Xt port
|
||||
* wxUSE_DYNAMIC_CLASSES is TRUE for the Xt port
|
||||
*/
|
||||
#define USE_DYNAMIC_CLASSES 1
|
||||
#define wxUSE_DYNAMIC_CLASSES 1
|
||||
/*
|
||||
* Disable this if your compiler can't cope
|
||||
* with omission of prototype parameters.
|
||||
|
||||
@ -250,7 +250,7 @@ wxLog *wxLog::GetActiveTarget()
|
||||
if ( !s_bInGetActiveTarget ) {
|
||||
s_bInGetActiveTarget = TRUE;
|
||||
|
||||
#ifdef WX_TEST_MINIMAL
|
||||
#ifdef wxUSE_NOGUI
|
||||
ms_pLogger = new wxLogStderr;
|
||||
#else
|
||||
// ask the application to create a log target for us
|
||||
@ -410,7 +410,7 @@ wxLogTextCtrl::~wxLogTextCtrl()
|
||||
// wxLogGui implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifndef WX_TEST_MINIMAL
|
||||
#ifndef wxUSE_NOGUI
|
||||
|
||||
wxLogGui::wxLogGui()
|
||||
{
|
||||
@ -804,7 +804,7 @@ wxLogWindow::~wxLogWindow()
|
||||
delete m_pLogFrame;
|
||||
}
|
||||
|
||||
#endif //WX_TEST_MINIMAL
|
||||
#endif //wxUSE_NOGUI
|
||||
|
||||
// ============================================================================
|
||||
// Global functions/variables
|
||||
|
||||
Loading…
Reference in New Issue
Block a user