AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56,330 Commits 1 Branch 0 Tags 297 MiB
e0fddcefb6
Commit Graph

53 Commits

Author SHA1 Message Date
Vadim Zeitlin
a349dc1085 Handle underlined and strikethrough attributes in wxGTK native font info. 
These attributes were not handled by wxFont::GetNativeFontInfoDesc() as it
only serialized the Pango font description which doesn't support them.

Fix this by handling these attributes explicitly and prepending them to the
Pango font string if necessary.

Closes #14559.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-09-15 23:17:12 +00:00
Vadim Zeitlin
c7a49742ec Add support for stricken-through fonts. 
Support stricken-through fonts in wxMSW and wxGTK (including special support
in wxStaticText and wxTextCtrl).

Closes #9907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-01-23 11:28:28 +00:00
Stefan Csomor
03c281617c trying to simplify and optimize font handling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-08 21:39:14 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space. 
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-21 10:41:26 +00:00
Stefan Csomor
aa6208d975 conforming to new naming convention of starting all port specific methods with the port prefix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-24 07:56:17 +00:00
Stefan Csomor
f1c40652a0 reworked font handling for osx 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-20 13:56:57 +00:00
Paul Cornett
b04237742c check for self-assignment in operator= 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-21 18:08:40 +00:00
Francesco Montorsi
53a2db124c substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-26 15:06:00 +00:00
Vadim Zeitlin
5e0ebb716a added wxNativeFontInfo() ctor from LOGFONT, this is convenient for MSW code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-07 19:02:26 +00:00
Robin Dunn
09da4ae594 export wxGetNativeFontEncoding and wxTestFontEncoding 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-03 03:03:14 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-09 10:09:52 +00:00
Václav Slavík
d7ae4a6264 moved wxMGL's font management code to common so that it can be reused by wxDFB; implemented wxDFB part 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-20 20:45:57 +00:00
Paul Cornett
706e740f50 build fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-29 06:53:31 +00:00
Vadim Zeitlin
85ab460e7d miscellaneous wxFont enhancements (patch 1496606): 
- made SetFaceName() bool and return false if the face name is not available
- corrected To/FromUserString() to complement each other


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-29 00:03:36 +00:00
Vadim Zeitlin
fbfb8bcc3f added missing consts and pass objects by const reference instead of by value (patch 1205869) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-24 21:43:15 +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
Włodzimierz Skiba
66e9a9f0ae [1231183] 'cleanup: mismatched indentation' and other cleanings. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-22 16:56:26 +00:00
Włodzimierz Skiba
82ef81ed9c Final MSW/PalmOS split. Remove dump copies of MSW specific code. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-12-22 07:22:25 +00:00
Włodzimierz Skiba
4055ed8281 Use __WXPALMOS__ for PalmOS port which fits __WX$(TOOLKIT)__ of bakefiles. Do not depend on MSW macros in PalmOS port. Source cleaning. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-12-20 12:44:22 +00:00
Julian Smart
ffecfa5aeb Committed William Osborne's wxPalmOS port 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-19 13:40:30 +00:00
Vadim Zeitlin
544229d106 added a way to create fonts with specified pixel size 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-25 23:03:44 +00:00
Włodzimierz Skiba
a62848fdba Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false, !!/!IsEmpty(). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-14 12:08:28 +00:00
Vadim Zeitlin
23afe648ce implemented wxNativeFontInfo::operator=() when wxUSE_PANGO, this fixes crashes when wxFont::SetNativeFontInfo() is used 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-21 17:00:13 +00:00
Václav Slavík
fdf7514a00 fixed memory leak in wxNativeFontInfo when using Pango 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-02 20:54:12 +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
Vadim Zeitlin
7b162e540e include wrapwin.h instead of windows.h directly (fixes CE compilation problems) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-04-04 12:47:05 +00:00
Robin Dunn
e50d5284f9 Moved wxMacGetSystemEncFromFontEnc and wxMacGetFontEncFromSystemEnc to 
a module that is included in wxBase to prevent linking errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-23 02:43:29 +00:00
Stefan Csomor
34c2c1a1d9 font and system conversion functions for wxMac 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-22 18:36:06 +00:00
Vadim Zeitlin
3bf5a59b5e pointer returned by GetNativeFontInfo() is now const and must not be deleted (replaces patch 810192) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-24 01:23:37 +00:00
Mattia Barbon
e4ffab299a Compilation fixes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-20 13:34:49 +00:00
Václav Slavík
1202890513 added support for gcc precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-09 12:38:21 +00:00
Julian Smart
371a5b4e62 Removed erroneous copyright names and corrected licence spelling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-17 10:34:04 +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
Gilles Depeyrot
af49c4b8a2 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@16884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-08-31 11:29:13 +00:00
Robert Roebling
db16cab461 Lots of work to set PangoFontDescription as the 
native font info data. WIP.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-08-06 16:41:31 +00:00
Vadim Zeitlin
409d5a5860 better native font support for wxGTK 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-01-18 20:01:49 +00:00
Vadim Zeitlin
53f6aab752 added wxFont::IsFixedWidth(), documented it and implemented for wxGTK/Motif 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-01-14 19:04:35 +00:00
David Webster
cc95f4f947 OS/2 NativeFontInfo support 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-01-08 23:33:27 +00:00
Gilles Depeyrot
563f868d38 implemented native font stuff for wxMotif 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-01-01 17:27:49 +00:00
Vadim Zeitlin
60ce06808d disable native font stuff for wxMotif 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-28 21:27:42 +00:00
Václav Slavík
ef243e708a typo fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-24 14:06:23 +00:00
Vadim Zeitlin
7936354da7 code clean up, avoid duplicating the same code in font.cpp and fontutil.cpp 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-24 01:06:15 +00:00
Vadim Zeitlin
ab5fe83396 add more methods to wxNativeFontInfo: To/FromUserString and all the 
accessor methods and implemented some of them


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-21 21:39:45 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-06-26 20:59:19 +00:00
Vadim Zeitlin
09fcd88955 applied wxNativeFontInfo patch #103089 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-01-24 17:16:04 +00:00
Vadim Zeitlin
7826e2dd83 wxNativeFontInfo changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-12-18 21:15:16 +00:00
Václav Slavík
6b0eebc537 add wxFontEncoding member into wxNativeEncodingInfo 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-08 23:45:24 +00:00
Stefan Csomor
51abe921b8 wxMac (debug) builds and runs wxMinimal again 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-10 11:32:00 +00:00
David Webster
57c4d796c5 OS/2 PM specific fixes for validators and fonts 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-08 05:18:15 +00:00