__WXBASE__ -> wxUSE_BASE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index d1129f30b448971cc1009a6e73f9309bd27ea9d2..d6b020b2ab52688bf6e9c62db7683f075ba38f2b 100644 (file)
--- 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);
 }
 
         delete m_Hash -> Delete(filename);
 }
 

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index aa06d2208bda3f3e4d55eb2771cf3bb9141aefec..19f45aa4e3d5f97cb336948181f509e60e07a914 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -48,7 +48,7 @@
 // implementation
 // ===========================================================================
 
 // implementation
 // ===========================================================================
 

-#ifdef __WXBASE__
+#if wxUSE_BASE

 
 // ----------------------------------------------------------------------------
 // wxMessageOutput
 
 // ----------------------------------------------------------------------------
 // wxMessageOutput


@@ -146,7 +146,7 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...)
     ::wxLogMessage(wxT("%s"), out.c_str());
 }
 
     ::wxLogMessage(wxT("%s"), out.c_str());
 }
 

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 // ----------------------------------------------------------------------------
 // wxMessageOutputMessageBox
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputMessageBox

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index dedbbacedb2f20829fe96320bacd9ce3e1187fca..5d53b623fcf364de640978092ac63b5c78b81e2c 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -89,7 +89,7 @@
     #include "wx/msw/private.h"
 #endif
 
     #include "wx/msw/private.h"
 #endif
 

-#if 1 // def __WXBASE__
+#if wxUSE_BASE

 
 // ----------------------------------------------------------------------------
 // common data
 
 // ----------------------------------------------------------------------------
 // common data


@@ -530,7 +530,7 @@ bool wxYieldIfNeeded()
     return wxTheApp && wxTheApp->Yield(TRUE);
 }
 
     return wxTheApp && wxTheApp->Yield(TRUE);
 }
 

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 // ============================================================================
 // GUI-only functions from now on
 
 // ============================================================================
 // GUI-only functions from now on

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index f5a6a4b22a0520d3c1b28ff4072f895d2296e7ed..94299293e178c600ebf6bbb223328d29f38a8fba 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -127,7 +127,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
 // global HINSTANCE
 // ----------------------------------------------------------------------------
 
 // global HINSTANCE
 // ----------------------------------------------------------------------------
 

-#ifdef __WXBASE__
+#if wxUSE_BASE

 
 HINSTANCE wxhInstance = 0;
 
 
 HINSTANCE wxhInstance = 0;
 


@@ -141,5 +141,5 @@ void wxSetInstance(HINSTANCE hInst)
     wxhInstance = hInst;
 }
 
     wxhInstance = hInst;
 }
 

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index 019346167b6500abf59c765eca8c4877e734e711..354a88b6495c0150db3f7b336b06e874b3addef2 100644 (file)
--- 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
 //------------------------------------------------------------------------
 
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 

-#ifdef __WXBASE__
+#if wxUSE_BASE

 
 WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname)
 {
 
 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 // compilers having wopen() &c
 

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 #endif // wxUSE_UNICODE_MSLU
 
 #endif // wxUSE_UNICODE_MSLU

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 9cfda8856f1032592a7213022457279b698bcb3c..246a4c4e701671717f1201b56b1e2590b31db808 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -44,7 +44,7 @@
 #include <shellapi.h>
 #include "wx/msw/missing.h"
 
 #include <shellapi.h>
 #include "wx/msw/missing.h"
 

-#ifdef __WXBASE__
+#if wxUSE_BASE

 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Dynamic library function defs.
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Dynamic library function defs.


@@ -538,7 +538,7 @@ int wxFSVolumeBase::GetFlags() const
     return itr->second.m_flags;
 } // GetFlags
 
     return itr->second.m_flags;
 } // GetFlags
 

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 // ============================================================================
 // wxFSVolume
 
 // ============================================================================
 // wxFSVolume

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index f216487e983816154590c0a000f1a43ebee5586d..6cf4086cbf32d645361ebd686373ad5296944b34 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -39,7 +39,7 @@
 
 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS
 

-#ifdef __WXBASE__
+#if wxUSE_BASE

 
 #if defined( __MWERKS__ ) && defined(__MACH__)
 #define WXWIN_OS_DESCRIPTION "MacOS X"
 
 #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 // WXWIN_COMPATIBILITY_2_2
 

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI