Commit Graph

41 Commits

Author SHA1 Message Date
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
895cae46b7 work around (harmless) warnings in VC7 release build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-06 23:04:50 +00:00
Vadim Zeitlin
61b1a51bde allow comparison of int with 64 bit integer type (see #10637)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-03 09:59:31 +00:00
Vadim Zeitlin
390b8241d3 revert r60023 and really fixed compilation problems caused by r60017 by providing assertEquals(const char *, const char *) overload as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-04 23:55:05 +00:00
Vadim Zeitlin
599d12919c allow symmetric comparisons to work too in CPPUNIT_ASSERT_EQUAL (e.g. wxString==char*, size_t==int and not only char*==wxString, int==size_t)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-04 16:43:36 +00:00
Vadim Zeitlin
306f34a368 allow using CPPUNIT_ASSERT_EQUAL(int,unsigned) even on 64 bit platforms (see r59576)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-17 22:02:56 +00:00
Vadim Zeitlin
b2eabfe866 abstract VC6 workaround inside a WX_CPPUNIT_ALLOW_EQUALS_TO_INT() macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-04 16:04:22 +00:00
Vadim Zeitlin
a8fd1047b8 need to overload assertEquals(int,short) too to resolve ambiguity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-04 12:32:26 +00:00
Vadim Zeitlin
bad631840c more attempts to fix CppUnit::assertEquals for VC6 without breaking everything else
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-04 11:59:11 +00:00
Vadim Zeitlin
a54b285e7c allow using CPPUNIT_ASSERT_EQUAL(int, wxFileOffset) too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-04 00:47:10 +00:00
Vadim Zeitlin
e18865ecd7 add WX_ASSERT_EQUAL_MESSAGE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-19 11:51:21 +00:00
Vadim Zeitlin
93a800a95e minor icc warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-19 09:55:27 +00:00
Vadim Zeitlin
55d9f029b6 define operator<<(wxLongLong_t) for VC6 whether wxUSE_STD_IOSTREAM is 0 or 1 (fixes test compilation in the latter case)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-03 12:44:07 +00:00
Vadim Zeitlin
527587d347 really fix VC6 compilation of all testsi (without breaking VC9)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-03 00:31:16 +00:00
Vadim Zeitlin
6fc905e0e1 add yet another overload of assertEquals to fix another compilation error due to using different types inside CPPUNIT_ASSERT_EQUAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:34:12 +00:00
Vadim Zeitlin
2e9abe9e35 g++ compilation fix after latest changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 01:11:17 +00:00
Vadim Zeitlin
3896f1cc5f add assertEquals(int,unsigned short) overload to resolve the ambiguity resulting in tests comparing unsigned short with literal integer constants now that we have both assertEqals(int,unsigned int) and assertEquals(int, unsigned long) to satisfy VC6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 00:52:41 +00:00
Vadim Zeitlin
0fbfcdd068 for some reason having int/size_t assertEquals() overload is not always enough for VC6, so provide both unsigned int/long overloads instead and rely on size_t being one of them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-30 23:22:10 +00:00
Vadim Zeitlin
ece97e2882 remove the just added assertEquals(time_t, long) overload, it results in infinite recursion and crash if time_t is the same type as long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-19 20:07:36 +00:00
Vadim Zeitlin
3d9b0b5393 compilation fix for PCH-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-18 23:33:19 +00:00
Vadim Zeitlin
1de532f57e get rid of special WX_ASSERT_FOO_EQUAL macros by defining CppUnit::assertEquals() overloads for wx types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-18 23:07:23 +00:00
Vadim Zeitlin
77fa3d8243 add a special macro for comparing time_t values to fix unit test compilation on platforms with 64 bit time_t (such as FreeBSD 6.2 apparently)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-01 13:01:59 +00:00
Vadim Zeitlin
5769cf0f89 fix bugs introduced in wxCmdLineParser::ConvertStringToArgs() during Unicode transition; added a unit test for it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-12 17:03:09 +00:00
Vadim Zeitlin
aa709c269a compilation fix after r51188: only define operator<<() overloads for wxLongLong_t for VC6, next VC versions (and presumably all other compilers as we hadn't had problems with them before) define them in their standard library already
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-23 23:32:12 +00:00
Vadim Zeitlin
5098c258b2 compilation fixes for VC6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-13 01:13:03 +00:00
Vadim Zeitlin
b7c746d017 added WX_ASSERT_MESSAGE macro to simply using CPPUNIT_ASSERT_MESSAGE with wxString::Format()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-06 22:57:09 +00:00
Vadim Zeitlin
6919e3bb38 don't define operator<<(ostream&, wxString) at all if it's already defined in the library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-09 00:01:20 +00:00
Vadim Zeitlin
dad49cc7f9 compilation fix for wxUSE_STL==1 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-08 23:50:32 +00:00
Michael Wetherell
53e372c281 Define CPPUNIT_STD_NEED_ALLOCATOR to 0 if it is undefined as we compile with
-Wundef.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-02 14:56:09 +00:00
Vadim Zeitlin
232f89100e fix operator<<() for wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-25 23:22:41 +00:00
Vadim Zeitlin
49297c840b use wxSafeConvertWX2MB() instead of mb_str() in operator<<(wxString)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-15 00:18:56 +00:00
Vadim Zeitlin
d2001a563b added a macro for comparison size_t variables with literal constants, this is less ugly than explicitly casting the arguments to size_t; use it to fix base64 compilation under 64 bit platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-21 23:41:07 +00:00
Vadim Zeitlin
a9dce709f5 added WX_ASSERT_STR_EQUAL helper macro for comparing wxStrings with C strings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 21:54:29 +00:00
Michael Wetherell
ef0aeb729d Missing header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-16 08:01:17 +00:00
Michael Wetherell
2c94045365 Stream inserter to wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-30 08:37:39 +00:00
Julian Smart
99d800190a Added licence/copyright information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-04 18:57:50 +00:00
Michael Wetherell
14dc53b2f3 Change the format of the output so that you can jump to the error with your editor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-01 20:04:47 +00:00
Włodzimierz Skiba
68379eaf0a Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false, -1/wxID_ANY/wxDefaultCoord, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 12:56:07 +00:00
Václav Slavík
044a69a42d added some cppunit convenience macros (part of patch 924438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-11 20:59:26 +00:00
Václav Slavík
20f46e8dc8 BCC fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-01 07:17:50 +00:00
Vadim Zeitlin
86132a69bc added wrapper header for CppUnit headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 02:58:56 +00:00