Use __WINDOWS__ for OS checks and __WXMSW__ for GUI checks (round 2).

This is continuation of r70796 and serves the same purpose.

Closes #14065, #14066.

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

diff --git a/include/wx/atomic.h b/include/wx/atomic.h
index 9b7efacd680d7cbe35fde5dcd50ddee4f55923e5..250ca27f19fe9b7dfcdb4904728bbb9652963977 100644 (file)
--- a/include/wx/atomic.h
+++ b/include/wx/atomic.h
@@ -43,7 +43,7 @@ inline wxUint32 wxAtomicDec (wxUint32 &value)
 }
 
 
-#elif defined(__WXMSW__)
+#elif defined(__WINDOWS__)
 
 // include standard Windows headers
 #include "wx/msw/wrapwin.h"

diff --git a/include/wx/config.h b/include/wx/config.h
index 282e3960ff59c1e3e0b96c8cd6504d004265644a..54e821d918bf3b9b331cf1d469702a7f44814f7b 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -22,7 +22,7 @@
 
 // under Windows we prefer to use the native implementation but can be forced
 // to use the file-based one
-#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
+#if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE
     #include "wx/msw/regconf.h"
     #define wxConfig  wxRegConfig
 #elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE

diff --git a/include/wx/dde.h b/include/wx/dde.h
index cf5af6743eb160bc9823ca5a04e62f9e5cb260a9..0f74768f2ec4448d7f16dd850f390f5ff5ec8eb1 100644 (file)
--- a/include/wx/dde.h
+++ b/include/wx/dde.h
@@ -22,10 +22,10 @@ WX_DECLARE_USER_EXPORTED_LIST(wxDDEClient, wxDDEClientList, WXDLLIMPEXP_BASE);
 WX_DECLARE_USER_EXPORTED_LIST(wxDDEServer, wxDDEServerList, WXDLLIMPEXP_BASE);
 WX_DECLARE_USER_EXPORTED_LIST(wxDDEConnection, wxDDEConnectionList, WXDLLIMPEXP_BASE);
 
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
     #include "wx/msw/dde.h"
 #else
-    #error DDE is only supported on MSW
+    #error DDE is only supported under Windows
 #endif
 
 #endif

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index dcccca3274f64ccbf1cc46ea1a9d41a45f838743..d81e32700b5b1d59aa419a6acf7462eb0629e440 100644 (file)
--- a/include/wx/iconloc.h
+++ b/include/wx/iconloc.h
@@ -39,9 +39,9 @@ private:
     wxString m_filename;
 };
 
-// under MSW the same file may contain several icons so we also store the
+// under Windows the same file may contain several icons so we also store the
 // index of the icon
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
 
 class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
 {
@@ -65,7 +65,7 @@ wxIconLocation::wxIconLocation(const wxString& file, int num)
     SetIndex(num);
 }
 
-#else // !MSW
+#else // !__WINDOWS__
 
 // must be a class because we forward declare it as class
 class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 8978710672797ebfaf1aeb9bc9e1d5f76f7162af..569e3d80b2aa0596fe63cfbc1293f63ceec95217 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_JOYSTICK
 
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
 #include "wx/unix/joystick.h"

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index ccf2a0548f4e9e018e9051a4510710af393b617d..de43556b2cd154325dd94b919c84d3c02f5d783d 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -28,7 +28,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
-#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
     #include "wx/osx/listctrl.h"

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index fca6246d9ae69322387f9b39ef605b1889ae8be7..3567ba32059035612153f081ef7b6d52cd5adca5 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -234,7 +234,7 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #define wxStatusBarUniv wxStatusBar
     #include "wx/univ/statusbr.h"
-#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
+#elif defined(__WXMSW__) && wxUSE_NATIVE_STATUSBAR
     #include "wx/msw/statusbar.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar

diff --git a/samples/dll/my_dll.cpp b/samples/dll/my_dll.cpp
index bfd6ed508f6c3dde2df5c922aceb90b0e6da9d9b..3aa93e97083ffcb0792fab0f398267f5d2837c7e 100644 (file)
--- a/samples/dll/my_dll.cpp
+++ b/samples/dll/my_dll.cpp
@@ -22,8 +22,8 @@
     #pragma hdrstop
 #endif
 
-#ifndef __WXMSW__
-    #error "This sample is MSW-only"
+#ifndef __WINDOWS__
+    #error "This sample is Windows-only"
 #endif
 
 #include "wx/app.h"

diff --git a/samples/dll/wx_exe.cpp b/samples/dll/wx_exe.cpp
index a4b5263123c59e499d9d1a3f1d77e5c26306a11b..c48d674b316bba58d0558aa293766b3290d4d7ed 100644 (file)
--- a/samples/dll/wx_exe.cpp
+++ b/samples/dll/wx_exe.cpp
@@ -31,8 +31,8 @@
 #include "wx/stattext.h"
 #include "wx/button.h"
 
-#ifndef __WXMSW__
-    #error "This sample is MSW-only"
+#ifndef __WINDOWS__
+    #error "This sample is Windows-only"
 #endif
 
 #ifdef WXUSINGDLL

diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 2fdcf0d908c020b4123c59a087a3eba0d9112efc..1bd9e97b6b8552d3e300045b5c3faff7e19bd998 100644 (file)
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -32,7 +32,7 @@
 
 #include "wx/msw/ole/automtn.h"
 
-#ifndef __WXMSW__
+#ifndef __WINDOWS__
 #error "Sorry, this sample works under Windows only."
 #endif
 

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index cae2f058a95cdc74d73fd14800c56a5abfa2f479..a1147cad0681ab2ee02a366908bd4f142d8c6549 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -31,7 +31,7 @@
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"
 
-#if wxUSE_CONFIG_NATIVE && defined( __WXMSW__ )
+#if wxUSE_CONFIG_NATIVE && defined( __WINDOWS__ )
 #   define DO_REGTEST 1
 #else
 #   define DO_REGTEST 0

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 172fd95ba6fca609b8588f3dc7f58ac1e3d498c0..8f8da745bc73870a8019f2c9a0374bb3223d7cf9 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -37,7 +37,7 @@
 
 // define this to use XPMs everywhere (by default, BMPs are used under Win)
 // BMPs use less space, but aren't compiled into the executable on other platforms
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     #define USE_XPM_BITMAPS 0
 #else
     #define USE_XPM_BITMAPS 1

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 975dabe0aea14b9715b9307ddd91da970d5601d9..9647088067e24c9ff33cca816872d84f6065e779 100644 (file)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -163,7 +163,7 @@ void wxMessageOutputStderr::Output(const wxString& str)
 
 void wxMessageOutputDebug::Output(const wxString& str)
 {
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
     wxString out(AppendLineFeedIfNeeded(str));
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
@@ -202,7 +202,7 @@ void wxMessageOutputMessageBox::Output(const wxString& str)
     wxString out(str);
 
     // the native MSW msg box understands the TABs, others don't
-#ifndef __WXMSW__
+#ifndef __WINDOWS__
     out.Replace(wxT("\t"), wxT("        "));
 #endif
 

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 36a9dc1090f35f9f9d34eb5e3ac5a4704bcde5d3..33690a33222cc8ed6262c068c804c69c812fd935 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -2111,7 +2111,7 @@ wxFORCE_LINK_MODULE( socketiohandler )
 #endif
 
 // same for ManagerSetter in the MSW file
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     wxFORCE_LINK_MODULE( mswsocket )
 #endif
 

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 614ee459932895ec0935982076f0e833cbdce811..97bbf4fcb14bd8e7b01ef81054addc67288e6145 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -75,7 +75,7 @@
 #include "wx/platinfo.h"
 #include "wx/private/window.h"
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     #include "wx/msw/wrapwin.h"
 #endif
 

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index a12be2f6c45c916ec191c0efb6f2e80c7d5d0067..7ccf0d36ddb635f50805e57d38590326ae5d76d1 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -55,7 +55,7 @@
     #include  "wx/osx/private.h"  // includes mac headers
 #endif
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
 #include <windows.h>
 #include "wx/msw/winundef.h"
 #include "wx/volume.h"
@@ -71,7 +71,7 @@
     #include <ctype.h>
 #endif
 
-#endif
+#endif // __WINDOWS__
 
 #if defined(__OS2__) || defined(__DOS__)
     #ifdef __OS2__
@@ -310,7 +310,7 @@ int setdrive(int WXUNUSED_IN_WINCE(drive))
 #else
     newdrive[2] = wxT('\0');
 #endif
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
     if (::SetCurrentDirectory(newdrive))
 #else
     // VA doesn't know what LPSTR is and has its own set
@@ -1170,7 +1170,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArray
 
     wxString dirName(data->m_path);
 
-#if defined(__WXMSW__) || defined(__OS2__)
+#if defined(__WINDOWS__) || defined(__OS2__)
     if (dirName.Last() == ':')
         dirName += wxString(wxFILE_SEP_PATH);
 #endif
@@ -1572,7 +1572,7 @@ wxImageList *wxFileIconsTable::GetSmallImageList()
     return m_smallImageList;
 }
 
-#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
+#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB)
 // VS: we don't need this function w/o wxMimeTypesManager because we'll only have
 //     one icon and we won't resize it
 
@@ -1732,7 +1732,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
     {
         m_smallImageList->Add(bmp);
     }
-#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
+#if wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB)
     else
     {
         wxImage img = bmp.ConvertToImage();

diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index 0a697894dc60334e2fe1a64e7447e514e080ad07..de9e1144aaa4d152e3c38cf64529d7e34ef0886a 100644 (file)
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -35,7 +35,7 @@
 #include "wx/tokenzr.h"
 #include "wx/imaglist.h"
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     #include "wx/msw/wrapwin.h"
 #endif
 

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 1b9f8b04cede331fa8819b936854cf4745c2daef..158c0b64b845e70ecc6a8f66f47d8b210a59ea5e 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -641,9 +641,15 @@ bool wxJoystick::HasPOVCTS() const
 
 bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq)
 {
+#ifdef __WXMSW__
     BOOL changed = (pollingFreq == 0);
     MMRESULT res = joySetCapture((HWND) win->GetHWND(), m_joystick, pollingFreq, changed);
     return (res == JOYERR_NOERROR);
+#else
+    wxUnusedVar(win);
+    wxUnusedVar(pollingFreq);
+    return false;
+#endif
 }
 
 bool wxJoystick::ReleaseCapture()

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index b56777059f4070292bb0e5766ade01513673b818..bbe235d8501807a8efa03ddf6bb2c158ad68d9e4 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -409,7 +409,7 @@ void TempDir::RemoveDir(wxString& path)
 #   define WXARC_pclose(fp)
 #endif
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
 #   define WXARC_b "b"
 #else
 #   define WXARC_b
@@ -661,7 +661,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
         wxFileName fn(i->first, wxPATH_UNIX);
         TestEntry& entry = *i->second;
         wxDateTime dt = entry.GetDateTime();
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
         if (fn.IsDir())
             entry.SetDateTime(wxDateTime());
         else
@@ -806,7 +806,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
 
         const TestEntry& testEntry = *it->second;
 
-#ifndef __WXMSW__
+#ifndef __WINDOWS__
         // On Windows some archivers compensate for Windows DST handling, but
         // other don't, so disable the test for now.
         wxDateTime dt = testEntry.GetDateTime();
@@ -950,7 +950,7 @@ void ArchiveTestCase<ClassFactoryT>::VerifyDir(wxString& path,
 
             const TestEntry& testEntry = *it->second;
 
-#if 0 //ndef __WXMSW__
+#if 0 //ndef __WINDOWS__
             CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context,
                                    testEntry.GetDateTime() ==
                                    wxFileName(path).GetModificationTime());
@@ -1300,7 +1300,7 @@ void ArchiveTestSuite::AddCmd(wxArrayString& cmdlist, const wxString& cmd)
 bool ArchiveTestSuite::IsInPath(const wxString& cmd)
 {
     wxString c = cmd.BeforeFirst(wxT(' '));
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     c += wxT(".exe");
 #endif
     return !m_path.FindValidPath(c).empty();

diff --git a/tests/benchmarks/strings.cpp b/tests/benchmarks/strings.cpp
index 616e371edfbf3aa2361697e73768aec68c239863..b1ee26936d12bd3f87c7ec868b55cf227fe7468a 100644 (file)
--- a/tests/benchmarks/strings.cpp
+++ b/tests/benchmarks/strings.cpp
@@ -356,7 +356,7 @@ BENCHMARK_FUNC(StringCmpNoCase)
 // Also benchmark various native functions under MSW. Surprisingly/annoyingly
 // they sometimes have vastly better performance than alternatives, especially
 // for case-sensitive comparison (see #10375).
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
 
 #include "wx/msw/wrapwin.h"
 
@@ -400,7 +400,7 @@ BENCHMARK_FUNC(MSWCompareStringIgnoreCase)
              ) == CSTR_EQUAL;
 }
 
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
 // ----------------------------------------------------------------------------
 // string buffers: wx[W]CharBuffer

diff --git a/tests/exec/exec.cpp b/tests/exec/exec.cpp
index 50c01edd81840ddecba0aafd2ea9d7c13610cec2..4355808d3f138118f0443aefbf3cb6a5411c954d 100644 (file)
--- a/tests/exec/exec.cpp
+++ b/tests/exec/exec.cpp
@@ -27,7 +27,7 @@
     #define ASYNC_COMMAND "xclock"
     #define SHELL_COMMAND "echo hi from shell>/dev/null"
     #define COMMAND_NO_OUTPUT "echo -n"
-#elif defined(__WXMSW__)
+#elif defined(__WINDOWS__)
     #define COMMAND "cmd.exe /c \"echo hi\""
     #define ASYNC_COMMAND "notepad"
     #define SHELL_COMMAND "echo hi > nul:"

diff --git a/tests/file/dir.cpp b/tests/file/dir.cpp
index c1092139092439dda3b03c8fee36dd5c73cb7f67..caffd17a6d8448bdf6a9709e753f0c909c3781f0 100644 (file)
--- a/tests/file/dir.cpp
+++ b/tests/file/dir.cpp
@@ -178,7 +178,7 @@ void DirTestCase::DirExists()
         { ".", true },
         { "..", true },
         { "$USER_DOCS_DIR", true },
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
         { "$USER_DOCS_DIR\\", true },
         { "$USER_DOCS_DIR\\\\", true },
         { "..\\..", true },
@@ -202,20 +202,20 @@ void DirTestCase::DirExists()
 #endif
     };
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     wxString homedrive = wxGetenv("HOMEDRIVE");
     if ( homedrive.empty() )
         homedrive = "c:";
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
     for ( size_t n = 0; n < WXSIZEOF(testData); n++ )
     {
         wxString dirname = testData[n].dirname;
         dirname.Replace("$USER_DOCS_DIR", wxStandardPaths::Get().GetDocumentsDir());
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
         dirname.Replace("$MSW_DRIVE", homedrive);
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
         std::string errDesc = wxString::Format("failed on directory '%s'", dirname).ToStdString();
         CPPUNIT_ASSERT_EQUAL_MESSAGE(errDesc, testData[n].shouldExist, wxDir::Exists(dirname));

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index aefd7fee5701e0927528e5c47575489868b6a8b8..addf9ad49ff9e024930379c7959aa9020afac24f 100644 (file)
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -26,9 +26,9 @@
 #include "wx/stdpaths.h"
 #include "wx/scopeguard.h"
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     #include "wx/msw/registry.h"
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
 #ifdef __UNIX__
     #include <unistd.h>
@@ -323,7 +323,7 @@ void FileNameTestCase::TestNormalize()
     } tests[] =
     {
         // test wxPATH_NORM_ENV_VARS
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
         { "%ABCDEF%/g/h/i", wxPATH_NORM_ENV_VARS, "abcdef/g/h/i", wxPATH_UNIX },
 #else
         { "$(ABCDEF)/g/h/i", wxPATH_NORM_ENV_VARS, "abcdef/g/h/i", wxPATH_UNIX },
@@ -407,7 +407,7 @@ void FileNameTestCase::TestNormalize()
     // and also that the registry key was changed recently and didn't take
     // effect yet but these are marginal cases which we consciously choose to
     // ignore for now)
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     long shortNamesDisabled;
     if ( wxRegKey
          (
@@ -421,7 +421,7 @@ void FileNameTestCase::TestNormalize()
         CPPUNIT_ASSERT_EQUAL( "..\\mkinstalldirs", fn.GetFullPath() );
     }
     //else: when in doubt, don't run the test
-#endif // __WXMSW__
+#endif // __WINDOWS__
 }
 
 void FileNameTestCase::TestReplace()
@@ -605,7 +605,7 @@ void FileNameTestCase::TestCreateTempFileName()
         { "foo", "$SYSTEM_TEMP", true },
         { "..", "$SYSTEM_TEMP", true },
         { "../bar", "..", true },
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
         { "$USER_DOCS_DIR\\", "$USER_DOCS_DIR", true },
         { "c:\\a\\directory\\which\\does\\not\\exist", "", false },
 #elif defined( __UNIX__ )

diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp
index 8840342dc756938ddbb5396d984912b45bed735b..a3fc759dcca2f364fe9c7479728af19166b7098d 100644 (file)
--- a/tests/fswatcher/fswatchertest.cpp
+++ b/tests/fswatcher/fswatchertest.cpp
@@ -428,9 +428,9 @@ private:
         CPPUNIT_TEST( TestEventModify );
 
         // MSW implementation doesn't detect file access events currently
-#ifndef __WXMSW__
+#ifndef __WINDOWS__
         CPPUNIT_TEST( TestEventAccess );
-#endif // __WXMSW__
+#endif // __WINDOWS__
 #endif // !wxHAS_KQUEUE
 
         CPPUNIT_TEST( TestNoEventsAfterRemove );

diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
index 3d6492cbcd6e4e7f7d608652fed6c06fb00340ca..2722ca8952f7d482153e0b83bf91ea0c79f9e973 100644 (file)
--- a/tests/interactive/output.cpp
+++ b/tests/interactive/output.cpp
@@ -90,7 +90,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( InteractiveOutputTestCase, "InteractiveOu
 // wxDllLoader
 // ----------------------------------------------------------------------------
 
-#if !defined(__WXMSW__) && !defined(__UNIX__)
+#if !defined(__WINDOWS__) && !defined(__UNIX__)
     #undef TEST_DYNLIB
 #endif
 

diff --git a/tests/misc/dynamiclib.cpp b/tests/misc/dynamiclib.cpp
index bf3335009948e1e465d379794a3f498319685a1c..acd16c4e47a5767d38c5ec7c8ad253b19c47f1b5 100644 (file)
--- a/tests/misc/dynamiclib.cpp
+++ b/tests/misc/dynamiclib.cpp
@@ -46,7 +46,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DynamicLibraryTestCase, "DynamicLibraryTe
 
 void DynamicLibraryTestCase::Load()
 {
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
     static const wxChar *LIB_NAME = wxT("kernel32.dll");
     static const wxChar *FUNC_NAME = wxT("lstrlenA");
 #elif defined(__UNIX__)
@@ -74,7 +74,7 @@ void DynamicLibraryTestCase::Load()
     // Call the function dynamically loaded
     CPPUNIT_ASSERT( pfnStrlen("foo") == 3 );
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     static const wxChar *FUNC_NAME_AW = wxT("lstrlen");
 
     typedef int (wxSTDCALL *wxStrlenTypeAorW)(const wxChar *);
@@ -86,5 +86,5 @@ void DynamicLibraryTestCase::Load()
     CPPUNIT_ASSERT_MESSAGE( errMsg2.ToStdString(), pfnStrlenAorW );
 
     CPPUNIT_ASSERT( pfnStrlenAorW(wxT("foobar")) == 6 );
-#endif // __WXMSW__
+#endif // __WINDOWS__
 }

diff --git a/tests/net/ipc.cpp b/tests/net/ipc.cpp
index cb5549086993b76e416c75b4e6f9276c456e2e08..9782867044e29bb94aab5d9f2c0df97ac3a32409 100644 (file)
--- a/tests/net/ipc.cpp
+++ b/tests/net/ipc.cpp
@@ -262,4 +262,4 @@ void IPCTestCase::Disconnect()
 
 #endif // wxUSE_THREADS
 
-#endif // !__WXMSW__
+#endif // !__WINDOWS__

diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp
index da11ccaeca4c94df640c38f1face689bf0bede5a..9c8e0caf866455ab5a61fa89df61d48c06e5defc 100644 (file)
--- a/tests/streams/largefile.cpp
+++ b/tests/streams/largefile.cpp
@@ -35,7 +35,7 @@
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     #include "wx/msw/wrapwin.h"
     #ifdef __VISUALC__
         // 'nonstandard extension used : nameless struct/union' occurs inside
@@ -305,7 +305,7 @@ CppUnit::Test *largeFile::suite()
 // are picked up. However this is only possible when sparse files are
 // supported otherwise the tests require too much disk space.
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
 
 #ifndef FILE_SUPPORTS_SPARSE_FILES
 #define FILE_SUPPORTS_SPARSE_FILES 0x00000040
@@ -400,7 +400,7 @@ CppUnit::Test* GetlargeFileSuite()
         return NULL;
 }
 
-#else // __WXMSW__
+#else // __WINDOWS__
 
 bool IsFAT(const wxString& WXUNUSED(path)) { return false; }
 void MakeSparse(const wxString& WXUNUSED(path), int WXUNUSED(fd)) { }
@@ -436,7 +436,7 @@ CppUnit::Test* GetlargeFileSuite()
         return NULL;
 }
 
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "largeFile");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "Streams.largeFile");

diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp
index 1d1ec0375b912330bc68e78344cc9c74e503a879..aa089980fd29441dd9642b4e424af4aedaaf7096 100644 (file)
--- a/tests/streams/textstreamtest.cpp
+++ b/tests/streams/textstreamtest.cpp
@@ -93,7 +93,7 @@ TextStreamTestCase::TextStreamTestCase()
 {
 }
 
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)
 #   define NEWLINE "\r\n"
 #   define NEWLINELEN 2
 #elif defined(__WXMAC__) && !defined(__DARWIN__)

diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index 14fb85ff9483994036231c877283ccec06053e33..df44cffffa630f6014f4611449822d057aae04e8 100644 (file)
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -272,7 +272,7 @@ void VarArgTestCase::ArgsValidation()
 
     // check size_t handling
     size_t len = sizeof(*this);
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     wxString::Format("%Iu", len);
 #else
     wxString::Format("%zu", len);

diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp
index 5bae041c888ef512a41536cc391ddb2e13df2f4e..b37d0e50a89733d5dc6a8a83e14cec6bb60dd3ae 100644 (file)
--- a/tests/strings/vsnprintf.cpp
+++ b/tests/strings/vsnprintf.cpp
@@ -425,7 +425,7 @@ void VsnprintfTestCase::LongLong()
 
     CMP3("123456789", "%llu", (wxULongLong_t)123456789);
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     CMP3("123456789", "%I64d", (wxLongLong_t)123456789);
     CMP3("123456789abcdef", "%I64x", wxLL(0x123456789abcdef));
 #endif

diff --git a/tests/test.cpp b/tests/test.cpp
index 983bc4f3ce2eb2326046d95a315ef40c9417f377..bdd531d5ed01bee4a595def54e0188cc11733440 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -45,7 +45,7 @@
 #include <exception>
 #include <iostream>
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     #include "wx/msw/msvcrt.h"
 #endif
 

diff --git a/tests/xlocale/xlocale.cpp b/tests/xlocale/xlocale.cpp
index 4c6f6c8067f3148b5ee37d87e4e03eb9f54377f5..2b3474b96f51c5c671435e6b55749d5a64b55a8d 100644 (file)
--- a/tests/xlocale/xlocale.cpp
+++ b/tests/xlocale/xlocale.cpp
@@ -75,7 +75,7 @@ void XLocaleTestCase::TestCtor()
 
 #ifdef wxHAS_XLOCALE_SUPPORT
     CPPUNIT_ASSERT( wxXLocale(wxLANGUAGE_FRENCH).IsOk() );
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     CPPUNIT_ASSERT( wxXLocale("french").IsOk() );
 #else
     CPPUNIT_ASSERT( wxXLocale("fr_FR").IsOk() );