Commit Graph

130 Commits

Author SHA1 Message Date
Stefan Csomor
f41d5991df fixing a few typos, wxAny copy constructor implementation, making wxAnyList available everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-06 11:06:12 +00:00
Jaakko Salli
15ec7f782d Allow wxVariant::Convert(wxUniChar* value) to convert single-character string into a character.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-13 20:12:03 +00:00
Václav Slavík
281448385a Add std::[w]string support to wxVariant.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-05 14:23:21 +00:00
Jaakko Salli
6589f1a49a Fix compilation when wxAny was disabled (fixes #12148)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-15 13:34:01 +00:00
Jaakko Salli
153107b402 Allow wxAny to contain 'const char*' or 'const wchar_t*'. This was previously not possible since these pointers were converted to wxString, as convenient means to work with string literals. Now pointers (to string literals) are stored instead, and As<wxString>(), comparison operators do the type conversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-22 13:51:38 +00:00
Jaakko Salli
0aaed451fd Fix wxAny for VC6 by removing 'wxAny& operator=(const wxVariant &variant)' for it. This will break some cases of implicit wxVariant->wxAny conversion (for VC6).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-18 11:15:26 +00:00
Robert Roebling
2a227e8c9f Added virtual destructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-17 12:34:32 +00:00
Jaakko Salli
ea412ac4eb Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-17 08:59:13 +00:00
Jaakko Salli
5ceb034560 Try a blind fix for VC6 compilation issues (wxAny ctor has become too ambiguous now that it has a form that takes wxVariant reference)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-16 15:34:46 +00:00
Jaakko Salli
0bf14ab8b1 wxVariant <-> wxAny conversion functionality. Includes implicit construction of wxAny from wxVariant, and vice versa. wxVariant->wxAny conversion is implemented by adding new virtual member function into wxVariantData. wxAny->wxVariant conversion is implemented by associating wxAnyValueTypes with functions that generate wxVariantData instances (using a hash map).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-16 14:33:52 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
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
Jaakko Salli
f81bd28859 Fixed printf-related warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 23:27:04 +00:00
Jaakko Salli
4e00b90802 Added support for wxLongLong and wxULongLong in wxVariant (closes #10166)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 22:43:27 +00:00
Jaakko Salli
cf25a599cd Converted wxVariant to use wxObject's reference counting facilities. Should make sense as wxVariant already derived from wxObject and now wxVariantData inherits wxRefCounter/wxObjectRefData.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-13 14:55:45 +00:00
Vadim Zeitlin
92ffc98a08 reuse wxObjectRefData for various ref-counted classes (closes #10886)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 17:14:28 +00:00
Václav Slavík
de4983f323 split wxCharTypeBuffer<T> into wxScopedCharTypeBuffer<T> and wxCharTypeBuffer<T> -- the former is for transient data with validity limited to parent's lifetime, the latter is for permanent storage of string data (bug #9638)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-27 15:33:55 +00:00
Vadim Zeitlin
c398434d92 abandon attempts to make wxAnyStrPtr behave as bool: user-defined logical operators don't short circuit silently breaking existing code so it is better to not provide them at all; instead simply return bool from the new versions taking wxString::const_iterator; advise to use the new versions in the new code and so in our own files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-25 09:54:10 +00:00
Vadim Zeitlin
73799292ca check that the conversion to wxDateTime was really successful
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-25 09:20:20 +00:00
Vadim Zeitlin
d099c754b5 return NULL from GetVoidPtr() for NULL variants instead of asserting (closes #9873)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 13:19:44 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-19 13:55:27 +00:00
Jaakko Salli
be53e8ae80 Let wxVariantDataDateTime::Write() and Read() work with invalid dates (otherwise wxVariant::GetString() will assert when value is an invalid wxDateTime)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-12 17:22:18 +00:00
Vadim Zeitlin
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:39:52 +00:00
Vadim Zeitlin
4c1d5d5ae2 remove tests for bool and {const,static,reinterpret}_cast in configure and wx/defs.h, all supported compilers have them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:16:09 +00:00
Robert Roebling
af4d748440 Ticket #1032 wxVariant::operator==(wxVariant& variant) has bad bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-13 19:23:45 +00:00
Vadim Zeitlin
1e6b2edfc8 remove ODBC and DBgrid libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-23 13:40:27 +00:00
Julian Smart
c8058a09e5 Added wxVariantData::Clone and wxVariant::Unshare
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-19 15:01:54 +00:00
Vadim Zeitlin
43ea4e37eb removed extraneous semicolon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-18 10:06:32 +00:00
Robert Roebling
9a0a58f5af Use typesafe wxVariantList in wxVariant instead of wxList
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-13 12:11:51 +00:00
Robert Roebling
7e6b478087 define typesafe wxVariantList (to be used by wxVariant instead of wxList
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-13 11:57:48 +00:00
Robert Roebling
3586d10f72 wxVariantData no longer inherits from wxObject
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-13 11:45:34 +00:00
Václav Slavík
af717fa87a fixed to make wxVariant compatible with both ANSI and Unicode modes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-06 23:02:16 +00:00
Václav Slavík
0bf751e7e9 compilation fixes for PCH-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-11 06:10:37 +00:00
Václav Slavík
52de37c78f 1. made CRT wrappers definitions indepenent of wxUSE_UNICODE: both ANSI and Unicode variants are now defined
2. split wxcrt.h into wxcrtbase.h with lowlevel compiler-specific definitions and wxcrt.h with ANSI- and Unicode-compatible wx wrappers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-10 17:14:14 +00:00
Václav Slavík
47b378bd88 removed extra semicolons (patch #1700459; fixes compilation with gcc's -pedantic flag)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-14 09:58:37 +00:00
Vadim Zeitlin
c1dc9f8394 removed WXWIN_COMPATIBILITY_2_4 from common and wxMSW files (patch 1675546)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 11:35:04 +00:00
Włodzimierz Skiba
07502d7351 Warning fixes after char->wxChar in wxVariant.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-02 07:09:20 +00:00
Robert Roebling
38f82bf695 Missed these in the char -> wxChar change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-30 21:01:04 +00:00
Robert Roebling
6f5d78250c Move wxVariant support for GDI classes to their
files (and thus away from wxBase).
  Add export declaration field for variant macros.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-30 20:45:15 +00:00
Robert Roebling
3f90a3994d Added DECLARE_VARIANT_OBJECT macros for easy conversion
from and to wxVariant using the shift left operator.
  Use the for GDI classes and wxImage.
  Document it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-30 15:37:52 +00:00
Robert Roebling
60acae80d0 Compilo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-30 11:33:54 +00:00
Robert Roebling
71520754fc Changed char to wxChar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-30 11:29:52 +00:00
Robert Roebling
2562c82329 Applied ref-couting patch.
Completely reorganized code (more readable to me).
  Minor other changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-30 11:20:14 +00:00
Robert Roebling
2f62094615 Added wxVariant's =, == and != operators for wxObject*
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-26 21:08:23 +00:00
Robert Roebling
63574b81fa Make GetWxObjectPtr() const.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-26 20:16:24 +00:00
Vadim Zeitlin
d5dc103fd4 added wxUSE_VARIANT guards
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-25 12:55:25 +00:00
Robin Dunn
65d48a2acf Fix my last fix. The method is pure virtual in the base class so it
can't be fully removed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-22 22:55:55 +00:00
Robin Dunn
581b9f53ae Remove the wxVariantDataString::Read method since the >> operator it
depends on has been removed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-22 21:55:03 +00:00
Robert Roebling
9c7669d7a4 [ 1559550 ] Fix wxVariant wxDateTime conversion from time string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-17 11:21:43 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-05 20:47:48 +00:00