Commit Graph

199 Commits

Author SHA1 Message Date
Vadim Zeitlin
d89b7c194d Correct a print format specifier mismatch in wxFileConfig::Parse().
Pass an int and not a size_t to a %d.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:35:49 +00:00
Vadim Zeitlin
975fb32b5c Don't crash when input is empty in wxFileConfig(wxInputStream) ctor.
Fix crash due to dereferencing a NULL pointer when the input buffer in
wxFileConfig ctor is empty.

Closes #11636.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-23 13:22:14 +00:00
Vadim Zeitlin
a57bfed905 No real changes, just remove the ugly CONST_CAST macro.
Use const_cast<> directly, we don't support compilers which don't have it any
more. And CONST_CAST macro conflicts with a macro with the same name (and
similar purpose) defined in Symbian headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-14 16:11:09 +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
Vadim Zeitlin
d8a7829312 move virtual GetPath() implementation out of line to work around an apparent Fedora g++ 4.x bug (see #10791)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-15 18:02:41 +00:00
Václav Slavík
6df09f32fd added length to wx(Scoped)CharBuffer to improve handling of embedded NULs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-29 20:58:39 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 11:45:59 +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
Stefan Csomor
26eef30437 OSX regrouping
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-29 19:47:40 +00:00
Stefan Csomor
bba0174ac7 adjusting endif comment to new #if
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-09 06:49:50 +00:00
Stefan Csomor
0cd1c6e304 make sure mac pref files remain visible and named as before
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-07 13:17:29 +00:00
Stefan Csomor
fe844054e8 cleaning up common OSX code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-07 16:56:04 +00:00
Vadim Zeitlin
b0bcc78732 remove leading dots from .ini/.conf in AddConfFileExtIfNeeded() as this results in double dots in the resulting file name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-04 12:14:40 +00:00
Vadim Zeitlin
9d55bfef2c don't use 8 bit characters in sources, this results in level 1 warning with VC8 (patch 1841741)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-03 22:09:26 +00:00
Vadim Zeitlin
9534d0dfdc reverted the change of r32940 which worked around a bug due to associating a dummy line with the root group, it's no longer necessary now that the root group line is always NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-26 22:53:26 +00:00
Vadim Zeitlin
9a7b779828 fix bug with adding entries to a root group containing only subgroups (as shown by new AddToExistingRoot() unit test)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-26 22:50:26 +00:00
Vadim Zeitlin
d20d5ee858 no need to use ToAscii() explicitly in wxBase64Decode() call after r49095
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-09 00:00:31 +00:00
Vadim Zeitlin
e86882e38d fix bug with deleting and recreating entries in wxFileConfig (patch 1796866)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-19 00:41:55 +00:00
Vadim Zeitlin
bf6d45ebf6 don't overwrite the existing local file if we failed to open it but it does exist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-26 20:40:33 +00:00
Vadim Zeitlin
8ca1a013e4 corrected off by 1 error in cMB2WC() call (thanks valgrind)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-24 00:36:22 +00:00
Vadim Zeitlin
89216929ee don't add an extra empty line to the end (fixes bug introduced by the last optimization round)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-23 22:36:37 +00:00
Vadim Zeitlin
cdbcd6c12f rewrite FilterInValue() using iterators, this results iin 12x performance improvement in UTF-8 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-20 01:03:33 +00:00
Vadim Zeitlin
5ad2b5ce07 speed up reading wxFileConfig from wxInputStream by factors of 3.5, 20 and 7 for ANSI/wchar_t/UTF-8 builds respectively (replaces patch 1755969)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-18 23:37:12 +00:00
Vadim Zeitlin
434e29032f add wxUSE_BASE64 checks around DoRead/WriteBinary() functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-16 20:38:42 +00:00
Vadim Zeitlin
50257dba06 compilation fix for DoReadBinary() in STL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-13 14:49:58 +00:00
Vadim Zeitlin
5814e8ba4e added support for binary data to wxConfig (slightly modified patch 1736788)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-12 00:11:03 +00:00
Václav Slavík
8650108199 don't use implicit wxString->char*/wchar_t* conversion, it will not be available in wxUSE_STL build in the future
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-10 17:42:41 +00:00
Vadim Zeitlin
6ad0a7d52f fix bug with not updating the last line correctly when a group was deleted and recreated (bug 1685312); added a unit test for this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-21 15:04:52 +00:00
Vadim Zeitlin
b4a980f4f5 don't use obsolete functions (mostly copystring() and Count()), remove their documentation (patch 1697956)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-11 00:23:19 +00:00
Vadim Zeitlin
d2ea08b9e1 don't check if the file exists if we don't use it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-18 21:08:17 +00:00
Vadim Zeitlin
466e87bd8c use wxStandardPaths and wxFileName in wxFileConfig resulting in big code simplification and cleanup but also in change of the default file locations under Windows (replaces patch 1620492)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-18 17:34:11 +00:00
Václav Slavík
c9f7896861 first phase of transition to unified Unicode build:
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*)
2. added template type-safe wrappers for vararg functions
3. added wxUniChar class representing single Unicode character
4. changed wxString::operator[] and wxString::iterator to return wxUniChar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-17 10:26:10 +00:00
Vadim Zeitlin
c4ec0ce820 derive wxConfig classes from wxObject and add wxRTTI macros to them (patch 1587607)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-10 18:16:10 +00:00
Vadim Zeitlin
8d7bfa660d fix the bug which could have resulted in failing to read config file if a chunk boundary fell in a middle of a multibyte character (patch 1674488)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-08 01:15:48 +00:00
Václav Slavík
1c8c91463f allow using both char* and wchar_t* in wxFileConfig and wxConfigBase, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-01 20:03:50 +00:00
Vadim Zeitlin
20160a32ea write the entire file at once in Flush() instead of doing it line by line (patch 1656509)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-11 02:09:39 +00:00
Vadim Zeitlin
fc9f11cc6f name user config file appname.conf when it's locayed in ~/.appname by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-20 14:15:57 +00:00
Vadim Zeitlin
04af2f5ce3 added wxCONFIG_USE_SUBDIR flag to wxFileConfig (patch 1620876)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 22:38:21 +00:00
Vadim Zeitlin
35c4b4da0a fix wxConfig::DeleteGroup() for arguments with trailing slash (replaces patch 1624589)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:36:54 +00:00
Vadim Zeitlin
e10b8ce820 fix the bug with renaming groups leaving wxFileConfig in inconsistent state (closes 705022)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-11 22:11:01 +00:00
Vadim Zeitlin
008202b7e9 added static casts to void * for pointers used with format specifier to silence stupid gcc pedantic warning (bug 1500717)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-24 17:05:46 +00:00
Vadim Zeitlin
2cf3a6d7be don't create non-existing groups in HasEntry()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-14 22:46:31 +00:00
Vadim Zeitlin
41f3015283 fix the bug with the current path being restored if it was under the group being deleted with DeleteGroup(); clarify what happens in this case in the docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-14 22:08:43 +00:00
Vadim Zeitlin
d595fb29c9 fix gcc warnings about in printf format (partly modified patch 1500717)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-25 23:47:50 +00:00
Włodzimierz Skiba
530ecef01f Include wx/stream.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-03 21:50:35 +00:00
Paul Cornett
4362c7052b wxASSERT(false) --> wxFAIL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-03 04:12:48 +00:00
Włodzimierz Skiba
de6185e212 Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-02 10:39:23 +00:00
Włodzimierz Skiba
670f993563 Include wx/app.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-28 12:44:37 +00:00
Włodzimierz Skiba
e4db172a3b Include wx/log.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-26 08:21:31 +00:00
Włodzimierz Skiba
ad9835c97c Include wx/dynarray.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-19 14:18:39 +00:00