Commit Graph

16 Commits

Author SHA1 Message Date
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
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
bd0a577993 updated wxXRC sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-12 10:33:21 +00:00
Václav Slavík
40e2d13434 use XML namespace in XRC files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-27 22:59:02 +00:00
Julian Smart
618f2efa41 Added __WXX11__ tests where appropriate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-21 10:32:18 +00:00
Václav Slavík
92657b4276 wxMGL compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-12 10:37: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
Julian Smart
847341dbeb Updated VC++ files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-18 14:33:01 +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
Gilles Depeyrot
bc0de1ee82 correction for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-06 14:48:08 +00:00
Julian Smart
3390b9ef88 More VC++ project file corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-19 17:47:23 +00:00
Julian Smart
e9799102dd Fixed project files for regex.lib, taking the regex C files out of the main wxvc.dsp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-10 17:03:02 +00:00
Julian Smart
264b3fc80f Project file updates; cast in strconv.cpp to compile with VC++ 6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-11 07:49:38 +00:00
Julian Smart
c862185052 Renamed project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-10 11:58:30 +00:00
Václav Slavík
999d9a9f79 changed wxXML to XRC, wx/xml/*.h->wx/xrc/*.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-09 22:18:45 +00:00