Commit Graph

40 Commits

Author SHA1 Message Date
Václav Slavík
c7418665cb compilation fix for wxUSE_FILESYSTEM=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@26009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 22:41:12 +00:00
Julian Smart
063f51a6ad Added wxWS_EX_BLOCK_EVENTS style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 22:20:33 +00:00
Václav Slavík
5343bb5fff compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 10:55:31 +00:00
Václav Slavík
2eaf6e0b4a fixed double filename->URL conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 10:06:48 +00:00
Václav Slavík
346dd7d756 fix filenames handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@22100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 11:52:47 +00:00
Václav Slavík
21f9c5560d fix for multiple initialization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 19:03:10 +00:00
Václav Slavík
3d20fa7032 XRC fixes for <object_ref> and relative file names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 22:16:27 +00:00
Václav Slavík
b836e27d04 XRCID lookup now handles standard IDs correctly (backported to 2.4)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 13:48:52 +00:00
Julian Smart
cd84d4a071 Fixed compilation by removing stream inclusion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-28 18:36:25 +00:00
Julian Smart
aca021757f Partially applied [ 632321 ] XRC object_ref fix
1. Fix object_ref so it at least works, with this I mean
XRC was not even handling the little sample in
tn0014.txt correct.

Hans Van Leemputten (hansvl)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 22:52:48 +00:00
Václav Slavík
7d0946bee1 fix object_ref lookup in case when object_ref node didn't specify class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-02 18:15:12 +00:00
Václav Slavík
1dc2721af8 removed wxXmlResource::GetFirstRoot for reasons explained at wx-dev
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-11-09 23:18:02 +00:00
Robert Roebling
0fce57ac76 Unicode copmile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-11-06 10:45:44 +00:00
Václav Slavík
349ac76e9a given an assert when trying to do something stupid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-14 22:40:40 +00:00
Robert Roebling
daa820fd8b Enable direct access to XML data in XRC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-13 16:19:15 +00:00
Václav Slavík
68a8e04526 more whitespaces as style deliminers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-11 22:23:58 +00:00
Václav Slavík
3ce501311b implemented subclass factories for XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-25 11:10:39 +00:00
Václav Slavík
3ec9ba300d added wxID_CLOSE_ALL to XRC (SF patch)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-18 23:03:13 +00:00
Václav Slavík
4dd75a6aaf added wxFrame* wxXmlResource::LoadFrame(parent,name)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-25 12:14:37 +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
db59a97cda 1. minor rewrite of XRC's stock_id/stock_client handling, now guesses client id from context
2. fixed 'platform' property handling


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-20 22:28:15 +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
Robin Dunn
b272b6dc42 Don't use ConvertToBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-26 21:42:06 +00:00
Václav Slavík
718cf16095 fixed translatable strings handling in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-03 23:25:58 +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
4d876ee3f7 wxXRC cleanup: removed .xmlbin format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-02 23:17:38 +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
Václav Slavík
480505bc6d 1. added encodings handling to XRC, so that it is possible
to load resources that don't use English+wxLocale for i18n
2. expat interface can now read non-utf-8 encodings as well


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-24 21:14:42 +00:00
Václav Slavík
1542c42e72 safer destruction of wxXmlResource::ms_instance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-18 19:04:50 +00:00
Václav Slavík
824e8eaacc added singleton interface to wxXmlResource, replaces wxTheXmlResource
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-17 23:41:53 +00:00
Václav Slavík
47793ab85a implemented Alex's <object_ref> symlinks in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-17 00:16:54 +00:00
Václav Slavík
4a1b95962f merged another part of Alex's work (LoadMenuBar w/ parent)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-15 23:37:55 +00:00
Václav Slavík
daa85ee3af implemented subclassing in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-29 16:13:43 +00:00
Václav Slavík
3f2eabd59d fixed i18n handling of _ in XRC texts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-18 23:12:40 +00:00
Václav Slavík
b5d6954b87 cosmetic change: XML resource -> XRC resource
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-23 19:38:05 +00:00
Václav Slavík
91cddacfe0 fix for typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-23 23:21:31 +00:00
Václav Slavík
d7b1d73c92 fixed my favorite bug (delete foo; call foo->Something())
and non-recursive destructors as an add-on :)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 18:31:40 +00:00
Václav Slavík
77b2f9b185 ProcessPlatformProperty should not be a member of wxXmlResource
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-23 18:57:19 +00:00
Václav Slavík
00393283ff Unicode complation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 23:01:31 +00:00
Václav Slavík
78d14f80e9 changed wxXML to XRC, wx/xml/*.h->wx/xrc/*.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-09 22:43:51 +00:00