Commit Graph

172 Commits

Author SHA1 Message Date
Václav Slavík
2f5b93fb9f added wxSplitterWindow to XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 23:19:04 +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
5dac8a3b0e fixed 2 encoding handling bugs in XRC/wxrcedit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 13:35:13 +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
Robin Dunn
9e05364039 More unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 06:24:15 +00:00
Václav Slavík
118cc185eb fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:16:27 +00:00
Julian Smart
fc7c8ae9c3 Applied [ 639060 ] Individual bar floating in contrib/fl
In the current contrib/fl implementation, all control bars
in the frame layout either float or they don't. I added
code to allow the bar floating to be determined on a bar-
by-bar basis. That is, this patch enables some control
bars to float while keeping others locked.

Kevin Yochum


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 09: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
Robin Dunn
f114b8580b Update to Scintilla 1.48
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-11 01:00:07 +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
Robin Dunn
a834585d74 Updated to Scintilla from 1.45 to 1.47
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-06 16:59:31 +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
Robin Dunn
4fcf77bc06 Added name to wxShapeCanvas ctor for consistency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-07-06 04:14:52 +00:00
Robin Dunn
366d7bd615 Added component control accessors to wxEditableListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-24 21:51:06 +00:00
Julian Smart
45d6fd80b3 Applied [ 565397 ] FL wxNewBitmapButton patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-23 13:38:50 +00:00
Chris Elliott
e104adcd97 wxSVGDC class include files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-19 09:17:46 +00:00
Robin Dunn
c13219d6a8 Changed FindTExt intercase to more easily handle additional flags.
Fixed GetCharAt and GetStyleAt to only return values 0..255 instead of
possibly negative values.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-04 19:25:29 +00:00
Robin Dunn
92bbd64f7f Patch 559673 and 561053
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-27 22:06:55 +00:00
Robin Dunn
0c5b83b0fa Added some inline helpers so the dependence on wxUSE_UNICODE and
wxUSE_WCHAR_T can be localized instead of having #if's all over the
place.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-13 23:31:02 +00:00
Gilles Depeyrot
69b8ed1bbc implemented cbCommonPaneProperties copy constructor and assignment operator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-08 12:36:12 +00:00
Robin Dunn
9c46ea6647 Make it easier to not use wxPopupWindow in wxSTC, and for now, don't
use it at all for the AutoComplete window.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-03 23:30:40 +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
Julian Smart
a977709b11 Canvas: added some DECLARE_CLASS macros to stop it failing
in class info initialisation
Mmedia: compiles agin
Plot: corrected VC++ project settings
Simple toolbar: should draw a highlight again now
Generic dir control: moved control ids to header for apps that
need to get hold of the individual controls
Scintilla: unconditionally compile Scintilla_LinkLexers() to correct
link error in sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-08 10:50:14 +00:00
Julian Smart
65e5084827 Added wxTB_NODIVIDER and wxTB_NOALIGN so native Windows toolbar can
used in FL.
Adjusted Windows toolbar height for wxTB_NODIVIDER style.
Removed some false memory leak reporting from fontmap.cpp, mimecmn.cpp,
strconv.cpp.
Added and used MapBitmap function in newbmpbtn.cpp so the right
colours are used under Windows.
<controversial>Added iniconf.cpp to WIN32 compilation</conroversial>


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-04 13:13:51 +00:00
Robin Dunn
0b9dfbc00e Give access to m_lastKeydownConsumed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-30 01:19:59 +00:00
Vadim Zeitlin
349f1d8ed3 fixed fl compilation after the recent tbar changes (patch 536539)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-29 09:39:18 +00:00
Robin Dunn
137b5242b1 More unicode related cleanup and fixes for wxPython
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-21 05:50:09 +00:00
Robin Dunn
10ef30eb53 wxStyledTextCtrl can now be built and used when wxUSE_UNICODE==1.
When in unicode mode Scintilla uses UTF-8 internally so the wxSTC
wrapper only needs to convert to/from UTF-8 in the right places.
Still need to figure out to get unicode characters from key/char
events...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-20 20:43:39 +00:00
Robin Dunn
1a2fb4cd61 Updated wxSTC from Scintilla 1.40 to Scintilla 1.45
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-18 22:31:01 +00:00
Václav Slavík
55232d19fe fixes to wxEditableListBox logic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-16 19:33:29 +00:00
Robin Dunn
c1fa2fda3c Changes needed for wxUSE_UNICODE for wxOGL to compile. I'm not
completely sure everything was converted right, but it at least
compiles now (and appears to work in wxPython.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-15 20:50:40 +00:00
Vadim Zeitlin
e53191be32 compilation fix after the array changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-09 12:25:03 +00:00
Robin Dunn
6187ec8f45 Added patch that adds style flags for wxEditableListBox to not use
some of its standard buttons.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-08 21:10:04 +00:00
Julian Smart
cd72551c2b Added VC++ project files for remaining Gizmo samples
Corrected some precompiled header issues for dynsash samples
Corrected IMPLEMENT_ABSTRACT_CLASS in multicell.cpp
Added an event function typedef and used it in dynsash sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-07 10:06:23 +00:00
Gilles Depeyrot
41b3c9662d correction to float array declaration following array implementation changes (will compile and run as before but probably doesn't do what was intended)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-07 09:47:22 +00:00
Julian Smart
45da7759b8 Applied [ 516382 ] FL toolbar patch
This patch addresses following issues on FL dynamic
toolbar:

* Removes duplicate code in
wxNewBitmapButton::RenderLabelImage(). (The code
between line 452-500 and 502-550 is the same.)

* Adds wxNewBitmapButton::Enable() own method to proper
drawing of enabled/disabled buttons.

* Changes "focused" state (of wxNewBitmapButton)
implementation from EVT_MOTION to
EVT_ENTER/LEAVE_WINDOW pair, because capturing mouse in
EVT_MOTION handler blocks some key events (control
characters, function keys), so underlynig app doesn't
receive all key events when mouse pointer is above
toolbar button.
Also "prev" state member variables are removed by this
patch (and IMHO they should be removed regardles on
accepting this patch - they are initalized and used
only in wxNewBitmapButton::OnMouseMove() method).
(Note: Blocking some keys can be only MSW problem, but
I can't verify it.)

* Adds EVT_LEFT_DCLICK handler to wxNewBitmapButton -
without this handler, toolbar button loses second
clicks if user presses left mouse button "fast enough".
Unfortunately, it doesn't handle drawing of
pressed/released button - it's only one event in
contrast to EVT_LEFT_UP/DOWN.

* Enables tooltips (in proper
wxDynamicToolBar::AddTool() method).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-06 19:05:25 +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
George Tasker
b2995a23bc Patch #514729 applied - adds missing RTTIs to wxToolLayoutItem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-08 13:36:14 +00:00
Kendall Bennett
574c939ef1 Merges from Scitech Branch (George Davison):
Added wxDisplayChangedEvent and triggering in MSW, when display mode changes
this event gets triggered. I don't know what should happen with other OS's
since I am not familiar with how they handle mode changes.

Watcome Version 11 now compiles with wide character support.

Fixed watcom warnings in
	html/htmlwin.h
	imagbmp.h
	listctrl.h
	imagbmp.cpp
	quantize.cpp
	strconv.cpp
	variant.cpp
	dirctrlg.cpp
	treectlg.cpp
	m_style.cpp
	fontenum.cpp
	listctrl.cpp
	ole\dataobj.cpp
	textctrl.cpp
	window.cpp
	xml.cpp

msw/setup.h
	with watcom version 11 it now compiles with wide character support.

xrc/xml.cpp
	fixed memory leak and compile warnings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-07 18:46:31 +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
Julian Smart
6e8515a3e3 Regenerated FL docs; applied patch [ #511363 ] Dialogs no longer need wx.rc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-31 20:57:31 +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
cc30b233fb added encodings handling to XRC, so that it is possible to load resources that don't use English+wxLocale for i18n
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-24 21:14:31 +00:00
Julian Smart
273b399fe9 Some comments modified to help with documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-23 11:55:09 +00:00
Václav Slavík
995c1788f5 added wxGenericDirCtrl handler to XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-23 00:15:13 +00:00
Julian Smart
4cbc57f086 Tidied/commented FL header files, regenerated docs and filled out Category section.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-21 22:34:42 +00:00
Václav Slavík
546b00063e slight corrections, moved bwd compat macros to the end of the file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-18 23:16:16 +00:00