Commit Graph

162 Commits

Author SHA1 Message Date
Vadim Zeitlin
ae2047c32a Add XRC handler for wxBannerWindow and a test for it to the xrc sample.
Also document the new XRC format elements.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:18:56 +00:00
Vadim Zeitlin
50c202914e No changes, just factor our wxDirection parsing code in wxXRC.
Move it from wxButtonXmlHandler into a reusable wxXmlResourceHandler::
GetDirection() that can used by the other handlers too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:18:49 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:14:35 +00:00
Vadim Zeitlin
9fc5a47ce6 Don't keep entries for XRC resources that failed to load in wxXmlResource.
Attempting to load a resource that couldn't be loaded resulted in
wxXmlResource::Load() returning false for this and _all_the_subsequent_ calls
to it because each call to Load() reattempted to reload all resources,
including the one(s) that failed to load initially.

Instead, try to load just the resource(s) that we should load right now and
ignore all the other ones. Also, don't add entries for the one(s) that we fail
to load.

This fixes the unit test failures in the XRC test case which was affected by
the test checking that XRC couldn't be loaded from garbage that ran before it.
It also makes the code simpler by ensuring that wxXmlResourceDataRecords
elements always have a valid wxXmlDocument associated with them.

Also clean up the code: use wxScopedPtr instead of manually deleting pointers
and reorganize #if checks to be easier to follow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-20 23:53:34 +00:00
Vadim Zeitlin
0526c8cc07 Add support for id ranges to XRC.
Allow to declare ranges of consecutive IDs in XRC by using the "id[n]" syntax.
Show this functionality in the xrc sample and test it in the new unit test.

Also show and test the "object reference" XRC functionality.

Closes #11431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 14:00:59 +00:00
Vadim Zeitlin
1f6ea93556 Make wxXmlResource::ReportError() wxXmlNode parameter const.
This function (and the related DoReportError()) doesn't need to modify its
"context" argument so take a const-pointer in it.

See #11431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 14:00:43 +00:00
Vadim Zeitlin
40730ad17d Make it easier to define custom wxSizerXmlHandler subclasses.
No real changes but refactor wxSizerXmlHandler to make it easier to derive
from it by adding virtual IsSizerNode() and DoCreateSizer() methods. To add
support for a custom sizer class you only need to override them in
wxSizerXmlHandler subclass now.

Also document wxSizerXmlHandler which was not documented at all previously.

Closes #11845.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 14:33:58 +00:00
Vadim Zeitlin
8ec22772d0 Make wxXmlResourceHandler::IsOfClass() static.
This simple helper function doesn't use any wxXmlResourceHandler data as it's
just a trivial wrapper for wxXmlNode::GetAttribute().

Making it static allows, in particular, to call it from const member functions
of wxXmlResourceHandler-derived classes (making it "const" itself would
achieve this too, of course, but it just doesn't need to be non-static).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 14:23:56 +00:00
Vadim Zeitlin
4689441b05 Add XRC handler for wxToolbook.
Closes #11615.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 18:56:28 +00:00
Vadim Zeitlin
53cdd2c11d Add XRC handler for wxCommandLinkButton.
Added a handler for wxCommandLinkButton class and a demo of it in the xrc sample.

Closes #12593.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-20 23:11:20 +00:00
Jouk Jansen
9015d579c8 use wxToggleButtonXmlHandler::DoCreateBitmapToggleButton on supoorted platforms only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-27 13:45:06 +00:00
Robert Roebling
3f6e622f7c Applied #11755: wxBitmapToggleButton Xml Handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-16 14:30:13 +00:00
Vadim Zeitlin
e9670814f5 Use UTF-8 for all non-ASCII characters in the sources.
Avoid mixing Latin-1, UTF-8 and Mac Roman (?) encodings in different source
files, use UTF-8 everywhere.

See #11116.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-18 16:16:12 +00:00
Vadim Zeitlin
af0ac990fc Add wxXmlResource::LoadObjectRecursively().
These methods can be used to load objects from anywhere in the XRC resource
tree and not just from the top level.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-14 23:22:00 +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
Vadim Zeitlin
0d14e4f21d added XRC handler for wxFileCtrl (closes #10785)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 17:40:11 +00:00
Vadim Zeitlin
adcda299c0 added wxEditbaleListBox XRC handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-04 23:41:51 +00:00
Vadim Zeitlin
ef18e79223 add support for defining list control columns in XRC too (and correct a few things in previously added list items support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-25 13:00:28 +00:00
Vadim Zeitlin
326462ae94 add support for loading wxListCtrl items and wxImageLists from XRC (closes #10647)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-07 17:29:57 +00:00
Václav Slavík
d0f063020e use <bitmapsize> to load bitmaps at the specified size in wxToolBar's XRC handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-05 18:23:04 +00:00
Václav Slavík
1c60f64458 set icons bundle, not single icon, for frames loaded from XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-29 21:25:23 +00:00
Robin Dunn
20072d3fc4 Use native EOL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-20 18:25:13 +00:00
Václav Slavík
afc0db8ca0 detect and report errors in XRC specification of grid sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-16 13:33:39 +00:00
Václav Slavík
159852aeae fixed wxXRC compilation with --disable-filesystem (bug #10580)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-16 13:18:27 +00:00
Václav Slavík
819559b2ac better XRC errors reporting: report location of the error and use unified formatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-15 10:29:14 +00:00
Václav Slavík
2bb9a404fb added wxXmlResource::LoadAllFiles()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-13 13:26:46 +00:00
Václav Slavík
04ae32cdab added wxXmlResource::LoadFile() to avoid URL-vs-filename ambiguity in Load()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-26 00:17:23 +00:00
Vadim Zeitlin
23239d944a add public wxXmlResource::GetResourceNode() which can be used directly instead of deriving from wxXmlResource and using FindResource()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-22 21:52:00 +00:00
Jaakko Salli
fef4b46dc7 Added XRC handler for wxComboCtrl (closes #10151)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 16:00:32 +00:00
Francesco Montorsi
2903e6998a just fix some $Id$ tokens
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-11 11:58:34 +00:00
Vadim Zeitlin
1808bb47b9 also call AddGrowableRow/Col() for wxGridBagSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-24 00:29:38 +00:00
Vadim Zeitlin
5dd238c6dd call wxFlexGridSizer::AddGrowableRow/Col() only after creating the sizer children, otherwise row/col index could be out of range (#10294)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-23 22:33:08 +00:00
Vadim Zeitlin
cc378c2d75 added wxXmlResource::FindXRCIDById() (#10026)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-14 11:44:10 +00:00
Václav Slavík
033508e1b1 get rid of public constants for various XRC defaults, there's no need for them outside of XRC loader
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-01 19:54:57 +00:00
Václav Slavík
df36fb0e72 whatever it is, wxXmlResource::GetFirstRoot() isn't implemented - removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-07 09:15:20 +00:00
Vadim Zeitlin
8758875e0b added enabled and hidden attributes to radio box items in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-02 18:21:38 +00:00
Vadim Zeitlin
7f5b84c22f compilation fix for --disable-filesystem --enable-xrc build (wxArrayString is needed here and was only included indirectly via wx/filesys.h) (ticket #9537)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-05 13:47:32 +00:00
Vadim Zeitlin
13a3888794 extracted wxWrapSizer in separate files and somewhat improved it (heavily modified patch 1876663)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-08 22:45:44 +00:00
Vadim Zeitlin
163b3ad72c replace wrong WXDLLEXPORT declarations with correct WXDLLIMPEXP_BASE/ADV/GL (patch from Tim Stahlhut)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-12 01:35:53 +00:00
Vadim Zeitlin
4f7d425f60 use correct WXDLLIMPEXP_FWD_XXX (patch from Tim Stahlhut)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-23 14:13:50 +00:00
Václav Slavík
b85e0ae0a1 globally disable VC++'s warning 4251 (non-exported member in dll-exported class and remove broken workaround trying to silence it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-07 17:15:37 +00:00
Vadim Zeitlin
03cf4aa61d apply XRCID() automatically to XRCSIZERITEM() argument (patch 1798697)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-20 16:29:05 +00:00
Michael Wetherell
8a2a5a449e template class WXDLLIMPEXP_FWD_XRC wxVector<wxXmlResourceHandler *>;
instantiates as well as forward declares, which gives us multiple definition
link errors on some systems. So trying WXDLLIMPEXP_FWD_XRC on the declaration
of m_handlers instead.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-18 21:49:27 +00:00
Vadim Zeitlin
8e4b5265cd declare wxVector<wxXmlResourceHandler *> as DLL-exported to avoid VC++ warnings in shared build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-17 00:40:10 +00:00
Vadim Zeitlin
86909f4c89 added XRCSIZERITEM() allowing to directly retrieve the sizer from XRC by name (patch 1782080)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-16 10:50:01 +00:00
Václav Slavík
eb2d0d232c use wxVector<T> instead of wxList in wxXmlResource code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-10 22:26:39 +00:00
Vadim Zeitlin
c7db82dced add XRC handler for wxSearchCtrl (extended patch 1751516)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-16 21:10:14 +00:00
Vadim Zeitlin
ca6328c44e use correct WXDLLIMPEXP macro for forward declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-15 12:45:41 +00:00
Vadim Zeitlin
f8efd2dfff set the correct properties for the source files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-15 11:43:32 +00:00