Commit Graph

31 Commits

Author SHA1 Message Date
Vadim Zeitlin
3da9cffc79 Replace wxST_MARKUP style with wxControl::SetLabelMarkup().
This is an incompatible change which removes the wxStaticText-specific
wxST_MARKUP style and adds wxControl::SetLabelMarkup() replacing it.

It doesn't actually change anything yet but it simplifies wxStaticText code a
lot by getting rid of many markup-related functions in it which had to behave
differently depending on whether wxST_MARKUP was used or not and also paves
way for adding markup support for the other controls in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:26 +00:00
Stefan Csomor
2895324520 merging back XTI branch part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Stefan Neis
79f45cf784 Rather use the "obvious" implementation of wxStaticText::DoGetLabel().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-06 20:49:07 +00:00
Stefan Neis
115de22f78 Tentative implementation of wxStaticText::DoGetLabel().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-06 20:42:29 +00:00
Stefan Neis
a8988cb339 Compilation fix for wxCStrData handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-06 20:31:02 +00:00
Vadim Zeitlin
39bc0347fd added support for ellipsization and markup in wxStaticText (modified patch 1629946)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-01 14:13:15 +00:00
Włodzimierz Skiba
ccdc11bbaf Include wx/stattext.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-30 17:39:22 +00:00
Włodzimierz Skiba
d5da0ce7cb Include wx/event.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-27 12:47:14 +00:00
Stefan Neis
61cc67648d Allow multiple lines for a static text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 16:01:33 +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
Stefan Neis
e94d504dd6 Applied patch #1190796 (Further accelerator changes).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-14 17:34:11 +00:00
David Webster
0fba44b410 Unicode fixes for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-27 01:19:43 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
David Webster
6e348b12dc More OS/2 updates reflecting changes in 24 Branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 15:47:35 +00:00
David Webster
b720b24da8 Lots of OS/2 updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-06 03:35:32 +00:00
David Webster
b3260bce47 Lots of fixes for scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-31 22:48:09 +00:00
David Webster
e58dab20ce Lots of fixes for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-23 23:12:33 +00:00
Stefan Neis
a4a162522b Added various #includes for non-precompiled headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-20 22:00:11 +00:00
David Webster
5d44b24ee6 OS/2 scrolling support for controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-07 00:49:10 +00:00
David Webster
7993e67c75 Update makefile and module def for new dynlib stuff. Also some control colouring stuff for OS/2 controls to better mesh with Panel backgrounds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-21 20:43:33 +00:00
David Webster
3c299c3ab6 OS/2 common controls code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-17 22:56:41 +00:00
David Webster
f15b49521a new Def file supporting const changes in wxObject. Bug fixes in STATTEXT and WINDOW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 16:10:04 +00:00
David Webster
1f3154c809 Static Box coded.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 22:24:55 +00:00
David Webster
a885d89ae9 Frame and Window coding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-21 05:12:34 +00:00
Stefan Neis
aa21388719 SN: Added #pragma implementation needed by GCC - expect more to come
but it seems to work right now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-14 22:45:47 +00:00
Václav Slavík
ad81651f00 removed USE_SHARED_LIBRARY(IES)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-14 23:57:30 +00:00
David Webster
e78c4d503e updates for DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-21 01:03:00 +00:00
David Webster
d90895ac11 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-18 03:30:47 +00:00
David Webster
0e320a79f1 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-07-29 05:11:30 +00:00