Commit Graph

61 Commits

Author SHA1 Message Date
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
Vadim Zeitlin
9249d38d6e use wxWindow::NewControlId() instead of wxNewId() to avoid clashes with the user-defined ids
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 14:15:54 +00:00
Robert Roebling
9e29cd0a28 [ 1581391 ] wxAnimationCtrl XRC handler
(most of)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-21 13:59:25 +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
Robin Dunn
d4a724d407 Make it possible to tell wxXmlResource which domain to pull
translatable strings from.

Make the wxLocale::GetString methods virtual so they can be overridden
in derived classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-21 18:27:15 +00:00
Václav Slavík
8e8a4e8587 reverted the change to not use wxList until dynarray.h is fixed to provide operator* in both STL and non-STL modes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-28 07:14:14 +00:00
Václav Slavík
67868c1e6c don't use untyped wxList in wxXmlResource
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-27 14:03:02 +00:00
Michael Wetherell
836724c3ce Missing header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-19 12:23:40 +00:00
Václav Slavík
984f1d84fd added default value argument to wxXmlResourceHandler::GetColour()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-15 15:32:57 +00:00
Włodzimierz Skiba
e8a793f06c XRC headers cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-04 18:08:09 +00:00
Michael Wetherell
2d672c46c0 Make IsOfClass out-of-line to defend against gcc 3.4.[56] bug:
http://lists.wxwidgets.org/cgi-bin/ezmlm-cgi?5:msp:75436:ofgfinakfempiciaejof


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-24 11:18:28 +00:00
Vadim Zeitlin
9b2a74693e allow to specify the value for unknown ids in GetXRCID() (patch 1448981)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-06 16:59:59 +00:00
Vadim Zeitlin
87152bb53d wxUSE_DATETIME==0 compilation fix (part of patch 1203970)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 16:40:10 +00:00
Vadim Zeitlin
84006e65e8 removed wxABI_VERSION checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:23:30 +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
Michael Wetherell
0f8218d7ca Add wxABI_VERSION > 20601 wrappers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-17 13:00:11 +00:00
Vadim Zeitlin
60fd818a78 added wxXmlResource::Unload() (replaces patch 1178853)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-13 18:01:43 +00:00
Vadim Zeitlin
cd900c5961 commented and documented wxXRC_NO_RELOADING flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-13 16:30:11 +00:00
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Michael Wetherell
43e8916ff3 Documentation fixes, patch 1179223 by Andreas Mohr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-08 14:34:30 +00:00
Václav Slavík
0c00c86faf fixed dialog units in toplevel windows (bug #1170234)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-28 09:28:44 +00:00
Václav Slavík
0c9ff74f05 fixed condition for using #pragmas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-07 21:27:20 +00:00
Václav Slavík
1df61962e8 added system colours and fonts support to XRC (based on patch #1038207)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 21:53:51 +00:00
Václav Slavík
ae688b6468 always use wxStaticCast in XRCCTRL (asserts in case of bad use in debug build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 15:13:11 +00:00
Václav Slavík
9a8d8c5a51 don't use m_instanceAsWindow to convert dialog units, it's not fully constructed yet and can't provide the information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 21:52:54 +00:00
Václav Slavík
984c33c9c7 added \ escaping in XRC (patch 1042675)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 10:23:16 +00:00
Robin Dunn
c846884b38 Make sure that WXMAKINGDLL_XRC is defined correctly for monolithic DLL builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 22:58:09 +00:00
Václav Slavík
621be1ec26 wxUSE_XRC implies wxUSE_XML now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 09:18:13 +00:00
Ryan Norton
da86e17765 wxUSE_XML and wxUSE_XRC build fixes if expat is not enabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 21:23:46 +00:00
Václav Slavík
a1e4ec8731 moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 08:53:16 +00:00
Václav Slavík
648db587c4 added wxXRC_NO_RELOADING
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-16 22:01:47 +00:00
Włodzimierz Skiba
f80ea77b4a wxID_ANY, wxDefaultSize, wxDefaultPosition, wxNOT_FOUND, true, false, tabs replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-11 13:14:23 +00:00
Julian Smart
be5a51fb59 More name changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 11:20:37 +00:00
Václav Slavík
d614f51b31 return false from wxXmlResource::Load if the resource is corrupted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-10 09:48:52 +00:00
Robin Dunn
408ac1b8cf MOre fixes for DLL builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 00:18:57 +00:00
Václav Slavík
a90d7e684a moved XML classes to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:12:55 +00:00
Václav Slavík
30dc34551b fixes for MSW/DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 13:33:42 +00:00
Václav Slavík
854e189f90 added wxRTTI to XRC handlers (patch #752996 by David Falkinder)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 18:10:38 +00:00
Václav Slavík
cf21abe595 deprecated XMLID and friends macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 22:15:03 +00:00
Václav Slavík
e5db16098c fix object_ref handling in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 23:14:27 +00:00
Václav Slavík
437bd21582 WX_XMLRES_CURRENT_VERSION_STRING wasn't Unicode safe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 00:21:23 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Gilles Depeyrot
ab7ce33c56 disable use of #pragma interface under Mac OS X
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as August Developer
Tools update contain a bug concerning #pragma interface handling that can only
be worked around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-07 12:28:46 +00:00
Václav Slavík
74c107ba48 fixes to newly added i18n code in XRC - don't use it if wxXRC_USE_LOCALE isn't used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-01 17:11:38 +00:00
Robin Dunn
92e898b0b4 Added generic LoadObject methods that can load any classtype from a
resources and return it as a wxObject (Assuming there is a handler for
it.)

Enabled wxFrames and wxDialogs to be loaded using a new instance
rather than only with existing instances.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-24 02:26:13 +00:00
Václav Slavík
7a442f311a minor rewrite of XRC's stock_id/stock_client handling, now guesses client id from context
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-20 22:27:24 +00:00
Julian Smart
af1337b041 Applied [ 594925 ] Implement wxArtProvider and XRC together
By Robert O'Connor (robertoconnor)

This patch is a draft which successfully allows a wxArtProvider to serve out icons to bitmaps for XRC files.

The syntax to use a wxArtProvider bitmap is:
<bitmap stock_id="wxART_INFORMATION" stock_client="wxART_TOOLBAR">somefallbackicon.png</bitmap>

The bitmap is optional, and will only be used as a fallback image, if the wxArtProvider returned a wxNullBitmap for some reason.

The client attribute, if not specified, currently will be wxART_OTHER. Perhaps there should be a guessing heuristic of it being in a menu node to call wxART_MENU.

Usage of XRC resouces and wxArtProvider together can be seen in an updated /contrib/samples/xrc demo, which is a separate patch.

Search the wx-dev mailing lists for "wxArtProvider" and "XRC" for the full discussions on this feature's API design.

Applied patch [ 594932 ] Extended XRC XML resources sample
By Robert O'Connor (robertoconnor)

This is a more comprehensive introduction to how to get up and running using XRC in your new wxWindows project.

It describes both the basics (for new users) and advanced features. It consists of a demo of dialogs and frames loaded from XRC. Each dialog has a textctrl at the top of the dialog, which walks the new user through that feature.

There are 8 demos:

The 4 basic ones:
-A non-derived dialog, as typically used for an about dialog.
-A derived dialog that loads its resources from an XRC (a frequently-asked question on the mailing lists), and responds to some simple events, including the disable-another-control-via-EVT_UPDATE_UI that is another FAQ, and powerful and simple-to-use feature.
-A XRC reference "Controls" dialog, using a notebook. Each tab has a single control. All XRC handled widgets can be seen at a glance, and how to use them under XRC.
-An uncentered dialog, to demonstrate the easy use of <centered>1</centered> to automatically place a Dialog centered on its parent..

The 4 advanced ones:
-Embedding a custom class into an XRC dialog, by using the "unknown" class.
-Using wxArtProvider to use stock icons from within your your XRC resources.
-Using the platform attribute to selectively show a part of XRC based on the current OS.
-Runtime variable expansion (demo only. Not implemented at this time).

Also:
-The main frame is now demonstrated as being loaded as an XRC.
- The toolbar has longhelp tag demonstrated, and are hooked up to the same events as the menu to show how XRCID() works on the same tool and menuitem XRCID.
-Some custom icons for the demonstration were created, and put into the toolbar and menubar. A custom icon also for the demonstration.
-The example code has been put in 1 class per file (both .cpp and a matching .xrc), to make it much less confusing for a newcomer to figure out what class is what, expecially with all the wx macros for declaration and implementation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-16 11:24:46 +00:00
Václav Slavík
11032cd905 compatibility macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-08 22:50:56 +00:00
Václav Slavík
ee1046d1cf don't translate accelerators in XRC menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-15 19:41:43 +00:00
Václav Slavík
5ed345b7ed XMLID->XRCID, XMLCTRL->XRCCTRL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-27 23:42:16 +00:00