Commit Graph

31765 Commits

Author SHA1 Message Date
Vadim Zeitlin
5421785005 update from liou xiao <liouxiao@hotmail.com>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 02:41:53 +00:00
David Surovell
c394a432fa fixed error in prior checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 01:14:06 +00:00
Vadim Zeitlin
53599fbbd8 Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 00:17:22 +00:00
Vadim Zeitlin
20a34d96ef regenerated makefiles after adding tokenizer.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 00:11:26 +00:00
Robin Dunn
fa31aeda87 After a conversaion with Vadim I reverted the last change and instead
just allowed for the specific situation that was incorrectly causing
the assert.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 20:51:14 +00:00
Robin Dunn
d2be15217a Fix for Bug #1387359, bail out early from DoWriteText if the string is empty.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 20:19:14 +00:00
David Surovell
fbc1d11bde minor cleanup; remove focus patch scaffolding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 19:54:48 +00:00
Vadim Zeitlin
fe224552a9 g++ 4/wxMAC_USE_CORE_GRAPHICS warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 16:12:48 +00:00
Vadim Zeitlin
6c28639791 just added a comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 16:11:58 +00:00
Vadim Zeitlin
423d529ccb compilation test for Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 01:23:17 +00:00
Dimitri Schoolwerth
6f72133189 fixed compile errors (code was using unnamed objects, resulting in compiler ambiguity)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 16:52:36 +00:00
Vadim Zeitlin
421274fade added tests showing that current wxStringTokenizer code doesn't handle multiple delimiters at the end of string properly in mode != wxTOKEN_STRTOK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 16:48:41 +00:00
Vadim Zeitlin
8b6d5b1fc3 extracted wxStringTokenizer tests in their own file and rewrote them to be table based and more clear (separated strtok()-compatibility test from the other one)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 16:34:09 +00:00
Vadim Zeitlin
a67f601b14 extracted wxStringTokenizer tests in their own file and rewrote them to be table based and more clear (separated strtok()-compatibility test from the other one)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 16:30:12 +00:00
Vadim Zeitlin
80ca48ebc6 update from Wei-Lun Chao
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 14:40:18 +00:00
Dimitri Schoolwerth
769627d79e fixed unreachable code warnings (occurred in MSVC6+Release mode)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 14:25:36 +00:00
Kevin Ollivier
acb4c4bdb0 Remove references to now removed iewin module. Replaced by activex/wxie.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 05:44:51 +00:00
Kevin Ollivier
4136a15d56 Removing old iewin extension. Replaced by activex/wxie.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 05:37:59 +00:00
Vadim Zeitlin
f3c49b55b0 added newline at end of file (avoids gcc warning when building with Xcode 2.2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 01:47:09 +00:00
Julian Smart
398c701f70 Fixed problem trying to print from a preview, whereby wrong printer
class was used instead of Gnome printer class.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 20:38:47 +00:00
Vadim Zeitlin
0b6d76bfd4 don't crash when XIM is used under IRIX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 16:06:31 +00:00
Vadim Zeitlin
c8a448977c removed DllMain(): we don't even compile it with any compiler but VC8 and with VC8 it results in a crash; we need another way to make it possible to use wx DLL from another DLL, this one is flawed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 14:34:12 +00:00
Vadim Zeitlin
a44fb285c5 documented Set/GetIcon(), added (not quite pure) virtual GetIcon() in the base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 13:56:23 +00:00
Vadim Zeitlin
333c869716 return a valid bitmap from GetBitmap() even if we created an icon internally
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 13:46:23 +00:00
Julian Smart
62bdd4db0e wxMac changes documented.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 12:04:11 +00:00
Włodzimierz Skiba
9d8b1d2f3e Somebody forgot to restore from testing phase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 11:09:19 +00:00
Włodzimierz Skiba
1ed6437807 __WIN95__ removed (used to differ win3.1 vs. 'modern' 95 look, nowadays always defined for WXMSW so useless). Minor cleanings and corrections for correct #includes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 10:55:11 +00:00
Włodzimierz Skiba
a71d815bbe __WIN95__ removed (used to differ win3.1 vs. 'modern' 95 look, nowadays always defined for WXMSW so useless). Minor cleanings and corrections for correct #includes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 10:47:44 +00:00
Vadim Zeitlin
634fb75048 fix for compilation without PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 10:03:04 +00:00
David Surovell
18f5234f0c removed unused local variable; converted tabs to spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 03:51:34 +00:00
Kevin Ollivier
39fc328f03 Use TranslateAccelerator so that TAB, Return, etc. keys are properly processed by wxActiveX controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 01:42:32 +00:00
Kevin Ollivier
89c8318014 Allow wx parents a chance to handle events fired by non-wx children. (i.e. wxActiveX controls)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 01:39:54 +00:00
Mart Raudsepp
b19d928925 timer.tex: wxTimerEvent is derived from wxEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 00:34:13 +00:00
Vadim Zeitlin
cba1c2ca12 assert if opening more than one find/replace dialog under the same parent -- this doesn't work currently (and maybe can't work at all)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 22:33:35 +00:00
Stefan Neis
cf44a61c24 Added implementation for wxLocaltime_r/wxGmtime_r.
Improved handling of windows compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 19:24:11 +00:00
Vadim Zeitlin
f107837e78 documented Set/GetLabel() treatment of mnemonics
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 16:39:18 +00:00
Vadim Zeitlin
b2ff89d648 1. changed wxControl::GetLabel() to return the originally provided label and
not the one stripped from mnemonics (this was inconsistent with the other
   ports and resulted in problems when using wxUpdateUIEvent::SetText())
2. added wxControl::GTKConvertMnemonics(), GTKRemoveMnemonics() and also
   helper GTKSetLabelForLabel() and GTKSetLabelForFrame() wrappers
3. use them instead of duplicating their code in different derived controls


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 16:37:56 +00:00
Vadim Zeitlin
d1d40c2176 removed GetLabel() which didn't do anything but forwarding to wxControl version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 16:34:17 +00:00
Vadim Zeitlin
33d5c15653 blatant compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 16:03:26 +00:00
Vadim Zeitlin
8dfd4fade8 code cleanup: make OutputString[Ent]() simpler to call by providing defaults for conversion parameters and using flag instead of a bool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 15:02:01 +00:00
Vadim Zeitlin
24c80a284c use correct encoding when saving in non-Unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 14:49:38 +00:00
Michael Wetherell
716e748b2f In the past some streams returned Eof() before the end was read past rather
after, and also some streams give an error instead of Eof(). Test the archive
streams work with parent streams that have any of these behaviours.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 13:58:55 +00:00
Michael Wetherell
abffc1ff5d Changes to cope with parent streams which return an error instead of eof at the
end of the file.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 13:51:24 +00:00
Julian Smart
b71e9aa4e2 Separated XML and HTML rich text I/O handlers
Cleaned up XML I/O
Added HTML handler to build system
Added encoding member for saving files output


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:31:07 +00:00
Julian Smart
63886f6d98 Fixed bug introduced by compiler compatibility fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:25:21 +00:00
Julian Smart
9dbadebe92 Should use LoadFile for file, not LoadPage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:24:25 +00:00
Julian Smart
3d941982de Added space after list item number, otherwise number is hard against following text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:22:20 +00:00
Michael Wetherell
9cbac6d19d Put back the warning flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 11:37:50 +00:00
Stefan Neis
a452689b23 Use thread-safe functions where possible.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-17 22:01:43 +00:00
Vadim Zeitlin
120edd5dbd use just SetSizerAndFit instead of 4 equivalent lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-17 19:23:04 +00:00