Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,023 Commits 1 Branch 330 Tags
7baf1ce2fd9bcf21e2bc336de46dd95fecf7a56b
Commit Graph

84 Commits

Author SHA1 Message Date
Václav Slavík
6fb9f7ee28 Add schema validation to wxrc. 
Add --validate and --validate-only flags to wxrc that perform validation
of the input files against the RELAX NG schema from misc/schema.

Jing must be installed for this to work.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-11 15:31:39 +00:00
Václav Slavík
04d13e2054 Fix incorrect wxExecute() use in wxrc. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-11 15:31:36 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword. 
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-26 16:02:46 +00:00
Václav Slavík
3c4845b418 Fix spurious errors about removing nonexistent files in wxrc. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-04-04 16:15:13 +00:00
Vadim Zeitlin
3496ce18d1 Recognize more XRC elements as containing translatable strings. 
This allows to translate the text of these elements in wxrc-generated code
using gettext.

Closes #14765.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-10-23 12:06:40 +00:00
Vadim Zeitlin
7a7fa93b0d A better fix for wxHash{Map,Set} with g++ 4.7. 
This reverts r70556, i.e. removes the scope operators added by it to all
WX_DECLARE_HASH_{MAP,SET} macros, and implements a workaround for the problem
due to the use of empty base class optimization in g++ 4.7 standard library
implementations inside the macros themselves by prepending the hasher and
comparator classes with explicit "struct".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-08-06 11:06:45 +00:00
Vadim Zeitlin
8d9eee8320 Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode. 
Fully qualify the hasher and comparator classes used with
WX_DECLARE_HASH_{SET,MAP} macros as they're used as base classes by the
standard library implementation in g++ 4.7 and using them without the scope
operator results in compilation errors because they're interpreted as being
(inaccessible) base classes and not the global ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-10 10:22:45 +00:00
Václav Slavík
2148394afb Don't crash if XRC file contains '_' at the end of a string. 
Parsing code for translating between '_' and '&' didn't properly handle
the case when the input was malformed and '_' wasn't followed by either
another '_' or another character. Added a check to guard against this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-01-15 17:45:14 +00:00
Dimitri Schoolwerth
6636ef8ddf Use wxString's empty() when checking if the string is (non-)empty throughout wx. 
Instead of constructs such as if "( s.length() )" and "if (s.length() > 0)" use "if ( !s.empty() )" instead. Similarly for "if (s.length() == 0)" or "if ( s.IsNull() )", use "if ( s.empty() )".
No code changes intended except for a few instances where a construct like "if ( s.length() && wxFileExists(s) )" was changed to not check the length of the string and let wxFileExists handle such cases.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-22 14:38:36 +00:00
Vadim Zeitlin
21567b0960 Output header to the same directory as the .cpp file in wxrc. 
If "-o" option is given, generate the output header file in the same directory
as the .cpp file and not in the current directory.

Closes #4054.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-24 14:34:22 +00:00
Vadim Zeitlin
e22fa4d7b2 Fix mismatches between format strings and arguments. 
This corrects the asserts which are now triggered when the actual arguments
don't match the format string.

Closes #12265.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-07-23 23:32:30 +00:00
Václav Slavík
9b1aeed1bb Fix strings formatting in wxrc. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-07-03 14:24:27 +00:00
Václav Slavík
0d373eac1d wxrc -g should output filenames in Unix format. 
It is customary in C source code and xgettext has problems with
backslahes in #line comments.

Fixes #10727.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-05-30 16:53:20 +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
Václav Slavík
e5fbeb79c1 wxrc: fix incorrectly generated code with --extra-cpp-code (fixes #9631) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-07 19:32:05 +00:00
Francesco Montorsi
bd365871aa s/wxSplitPath/wxFileName::SplitPath 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-07 01:47:47 +00:00
Vadim Zeitlin
81d3348a9b replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-02 02:43:11 +00:00
Václav Slavík
563a24f061 silence compiler warnings 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-21 13:53:37 +00:00
Vadim Zeitlin
e74f12021d don't leak wxFileType returned from GetFileTypeFromExtension(); fix compilation with wxUSE_MIMETYPE==0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-02 11:25:29 +00:00
Václav Slavík
21b2dde583 generate #line references to source .xrc files in wxrc --gettext (patch #1803492 by Heikki Linnakangas) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-30 11:11:51 +00:00
Vadim Zeitlin
db51a209d7 fix compilation due to wxCmdLineEntryDesc changes once again 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-17 14:37:12 +00:00
Vadim Zeitlin
0d5ab92f84 reverted the change of wxCmdLineEntryDesc fields to wxString as this doesn't compile with VC6; make them const char * instead 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-14 21:05:12 +00:00
Vadim Zeitlin
4ffb0f30f7 compilation fix after wxCmdLineEntryDesc changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-14 00:51:47 +00:00
Vadim Zeitlin
106e875e59 recognize hover bitmaps (patch 1758843) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-28 00:21:11 +00:00
Václav Slavík
288b6107e1 renamed wxXmlProperty to wxXmlAttribute, plus implied method names changes (bug #1751761) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-14 10:07:41 +00:00
Václav Slavík
9ec6078f41 fixed 'url' field extraction to be done for wxHtmlWindow only (bug #1741900) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-25 12:16:20 +00:00
Václav Slavík
09f0108224 made the code a bit more readable by not using _T() around to-be-generated code snippets 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-18 20:30:20 +00:00
Václav Slavík
5881d27bcf made the code a bit more readable by not using _T() around to-be-generated code snippets 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-18 20:22:08 +00:00
Václav Slavík
c5d7b81ecf improve XRC loading performance on Unix by avoiding MIME database loading 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-18 18:43:34 +00:00
Václav Slavík
6b24b421ce PCH-less compilation fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-27 21:03:46 +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
325cf48f5a add support for a data tag which can be used to embed arbitrary data into the generated code (part of some forgotten patch...) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-11 00:19:20 +00:00
Vadim Zeitlin
216d173fba renamed meaningless IsRealClass() function in CanBeUsedWithXRCCTRL() because this is what it really does 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-17 16:48:11 +00:00
Vadim Zeitlin
76ff8ed673 don't try to use XRCCTRL() with wxMenuBar or wxStaticBoxSizer, this fails (at run- or compile-time) (1st part of patch 1596624) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-17 16:46:23 +00:00
Vadim Zeitlin
aac18ec71e generate ctors with optional parent parameters in C++ code (patch 1238355) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-06 22:53:06 +00:00
Vadim Zeitlin
bc151e8486 recognize bitmap2 tag as containing a bitmap (used for disabled toolbar buttons) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-21 15:12:37 +00:00
Vadim Zeitlin
17a1ebd101 first round of Intel compiler warning fixes: down from a few thousands just to slightly more than 100 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-25 19:59:19 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-23 12:56:45 +00:00
Julian Smart
d69225772a Olly Betts' typo patch 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-31 09:29:22 +00:00
Włodzimierz Skiba
e7694e3be8 MinGW warning fixes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-01 20:34:39 +00:00
Vadim Zeitlin
be575a0160 enclose zip arguments in quotes, fixes behaviour for paths which contain spaces (fixed patch 1092970) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-01-31 22:17:18 +00:00
Václav Slavík
097d3ba2ab compilation fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-01-21 12:40:19 +00:00
Włodzimierz Skiba
2ad1ff540f Source cleaning, warning fixes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-01-13 19:57:24 +00:00
Julian Smart
caf6f46899 Wrapped two generated literals in _T 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-16 20:49:58 +00:00
Václav Slavík
8b34993daa added 'icon' property to wxFrame and wxDialog in XRC 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-31 11:42:27 +00:00
Václav Slavík
3747d6c0d5 generated resources code doesn't have to include <wx/wx.h> 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-02 15:30:32 +00:00
Robin Dunn
9a9942f75a Allow embedded double quotes, and hex-encode single quotes. Makes the 
typical case a bit more readable.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-29 00:20:27 +00:00
Robin Dunn
b27a4ef40d Updates for how the Python code is generated 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-29 00:15:21 +00:00
Václav Slavík
8da9d91cc4 don't include strings that shouldn't be translated in gettext output 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-29 18:27:51 +00:00
Václav Slavík
76ee049789 fixes for C++ code generator (modified patch 1010058) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-23 12:55:16 +00:00