From ec67cff1f6e63b3b27613a085f0492958e66a28e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 26 Jun 2003 23:46:00 +0000 Subject: [PATCH] __WXBASE__ -> wxUSE_BASE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fs_mem.cpp | 4 ++-- src/common/msgout.cpp | 4 ++-- src/common/utilscmn.cpp | 4 ++-- src/msw/main.cpp | 4 ++-- src/msw/mslu.cpp | 4 ++-- src/msw/volume.cpp | 4 ++-- src/unix/utilsunx.cpp | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index d1129f30b4..d6b020b2ab 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -74,7 +74,7 @@ class MemFSHashObj : public wxObject } }; -#ifdef __WXBASE__ +#if wxUSE_BASE //-------------------------------------------------------------------------------- @@ -201,7 +201,7 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename) delete m_Hash -> Delete(filename); } -#endif // __WXBASE__ +#endif // wxUSE_BASE #if wxUSE_GUI diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index aa06d2208b..19f45aa4e3 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -48,7 +48,7 @@ // implementation // =========================================================================== -#ifdef __WXBASE__ +#if wxUSE_BASE // ---------------------------------------------------------------------------- // wxMessageOutput @@ -146,7 +146,7 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...) ::wxLogMessage(wxT("%s"), out.c_str()); } -#endif // __WXBASE__ +#endif // wxUSE_BASE // ---------------------------------------------------------------------------- // wxMessageOutputMessageBox diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index dedbbacedb..5d53b623fc 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -89,7 +89,7 @@ #include "wx/msw/private.h" #endif -#if 1 // def __WXBASE__ +#if wxUSE_BASE // ---------------------------------------------------------------------------- // common data @@ -530,7 +530,7 @@ bool wxYieldIfNeeded() return wxTheApp && wxTheApp->Yield(TRUE); } -#endif // __WXBASE__ +#endif // wxUSE_BASE // ============================================================================ // GUI-only functions from now on diff --git a/src/msw/main.cpp b/src/msw/main.cpp index f5a6a4b22a..94299293e1 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -127,7 +127,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved)) // global HINSTANCE // ---------------------------------------------------------------------------- -#ifdef __WXBASE__ +#if wxUSE_BASE HINSTANCE wxhInstance = 0; @@ -141,5 +141,5 @@ void wxSetInstance(HINSTANCE hInst) wxhInstance = hInst; } -#endif // __WXBASE__ +#endif // wxUSE_BASE diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp index 019346167b..354a88b649 100644 --- a/src/msw/mslu.cpp +++ b/src/msw/mslu.cpp @@ -131,7 +131,7 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn) // Missing libc file manipulation functions in Win9x //------------------------------------------------------------------------ -#ifdef __WXBASE__ +#if wxUSE_BASE WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname) { @@ -200,6 +200,6 @@ WXDLLEXPORT int wxMSLU__wstat(const wxChar *name, struct _stat *buffer) #endif // compilers having wopen() &c -#endif // __WXBASE__ +#endif // wxUSE_BASE #endif // wxUSE_UNICODE_MSLU diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp index 9cfda8856f..246a4c4e70 100644 --- a/src/msw/volume.cpp +++ b/src/msw/volume.cpp @@ -44,7 +44,7 @@ #include #include "wx/msw/missing.h" -#ifdef __WXBASE__ +#if wxUSE_BASE //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // Dynamic library function defs. @@ -538,7 +538,7 @@ int wxFSVolumeBase::GetFlags() const return itr->second.m_flags; } // GetFlags -#endif // __WXBASE__ +#endif // wxUSE_BASE // ============================================================================ // wxFSVolume diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index f216487e98..6cf4086cbf 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -39,7 +39,7 @@ #endif // wxUSE_STREAMS -#ifdef __WXBASE__ +#if wxUSE_BASE #if defined( __MWERKS__ ) && defined(__MACH__) #define WXWIN_OS_DESCRIPTION "MacOS X" @@ -1049,7 +1049,7 @@ void wxFatalError( const wxString &msg, const wxString &title ) #endif // WXWIN_COMPATIBILITY_2_2 -#endif // __WXBASE__ +#endif // wxUSE_BASE #if wxUSE_GUI -- 2.45.2