cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53,052 Commits 1 Branch 0 Tags 333 MiB
c9355a3df6
Commit Graph

47 Commits

Author SHA1 Message Date
Vadim Zeitlin
59b7da02ff Return wxFONTFAMILY_DEFAULT, not UNKNOWN, from wxFont::GetFamily(). 
Although returning wxFONTFAMILY_UNKNOWN when the font family is not recognized
makes more sense, it breaks a lot of existing code including all the
font-related code generated by DialogBlocks, so prefer to return
wxFONTFAMILY_DEFAULT instead -- which can't be confused for a valid font
family neither but can be passed to wxFont ctor or SetFamily() without
problems.

To ensure that this behaviour is correctly implemented by all ports, rename
the existing wxFont::GetFamily() to DoGetFamily() and call the new method from
wxFontBase::GetFamily() which adjusts the return value if needed.

Closes #12330.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-29 13:46:09 +00:00
Vadim Zeitlin
64932e4105 No changes, just avoid overriding GetNativeFontInfoDesc() in wxMSW wxFont. 
wxFont::GetNativeFontInfoDesc() and GetNativeFontInfoUserDesc() were
overridden just to ensure that the font is realized but it makes sense to do
it in wxFontRefData::GetNativeFontInfo() itself as detecting the face name
won't work if the font is not realized anyhow. And then we don't need these
functions at all as the only thing they do is checking that the font is valid
when they are called but this can be done in the base class itself as this
should happen in all ports (document that this is the case).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-11-26 02:34:01 +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
Vadim Zeitlin
f76c075805 added convenient wxFont::Make{Bold,Italic,Smaller,Larger} and Scale() methods 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-12 20:11:21 +00:00
Francesco Montorsi
bff248644e wxMSW and wxPalmOS already had the wxFont(const wxSize&...) ctor; don't duplicate it 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-15 16:42:05 +00:00
Francesco Montorsi
b5791cc7af add the wxFont(const wxSize& pixelSize, ...) ctor to all ports; add some wxCHECK_MSGs to ensure that the wxSize objects contains non-negative arguments; document that passing zero for the width parameter is allowed; other minor doc fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-15 16:28:33 +00:00
Francesco Montorsi
9817be8a86 build fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-03 18:24:05 +00:00
Francesco Montorsi
0c14b6c324 fix the incoherence pointed out by ifacecheck between wx docs, that documents usage of the wxFontFamily, wxFontStyle and wxFontWeight enums in wxFont setters and getters, and the actual sources, which use 'int' instead; provided the same backward-compatibility pattern already used for wxBrush,wxPen both against 'int' overloads and against the wxDeprecatedGUIConstants enum values 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-03 17:02:25 +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
8f884a0dcc Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added 
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-15 17:54:20 +00:00
Vadim Zeitlin
8e34db1d94 allocate HFONT on demand instead of doing every time a font property is modified 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-13 21:59:55 +00:00
Vadim Zeitlin
adbd3cbc71 fix setting the properties of a valid but unshared font object broken in the last commit (HFONT wasn't recreated) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-13 20:35:58 +00:00
Vadim Zeitlin
f030b28c93 use AllocExclusive() instead of duplicating its code in wxFont-specific Unshare(); this fixes recreating the font whenever it is modified (even if it's not shared) bug 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-02-14 20:35:24 +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
f8855e4725 great copy ctor/assignment operators cleanup by Paul Cornett (patch 1307665) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-09 00:51:23 +00:00
Włodzimierz Skiba
c0089c96ec Minor cleanings. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-11-15 07:40:12 +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
Vadim Zeitlin
df455719ff keep the old wxFont::Create() signature (changed by font size in pixels patch) to fix XTI and to preserve backwards compatibility 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-27 11:02:11 +00:00
Ron Lee
88899f6b03 wxSize needs to be fully defined if we want to use it inline here. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-26 11:47: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
Vadim Zeitlin
4dddb8a2dd fixed gcc warnings about not calling base class ctor explicitly in copy ctors (patch 1028986) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-16 22:36:12 +00:00
Dimitri Schoolwerth
dabbc6a5a1 removed SetAutoLayout(true) calls when a corresponding SetSizer() was also called (the latter already calls SetAutoLayout(true) in case of a non-NULL window); usual cleanup: removing tabs and end of line whitespace, TRUE->true, FALSE->false, -1->wxID_ANY, Enable(false)->Disable(), ""->wxEmptyString 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-06-12 23:44:08 +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
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
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
Vadim Zeitlin
9045ad9dfc added DoSetNativeFontInfo() to avoid virtual function hiding 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-02-12 15:42:27 +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
Vadim Zeitlin
9cf8de4c74 implemented IsFixedWidth() correctly for MSW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-01-26 22:29:37 +00:00
Vadim Zeitlin
a9249b2eb2 wxFont can now raelly use the native fonts 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-22 03:31:48 +00:00
Julian Smart
04ef50df3a First pass at adding MicroWindows support 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-06-29 10:58:59 +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
76e23cdba3 compilation fixes for wxMSW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-12-18 23:49:58 +00:00
Vadim Zeitlin
30764ab524 applied wxNativeFontInfo patch from Derry Bryson (with minor changes) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-12-18 01:00:25 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-07-15 19:51:35 +00:00
Vadim Zeitlin
11c7d5b6d1 1. wxFontMapper seems to work for wxMSW 
2. font functions moved into a separate file, duplicated code in font.cpp
   and fontdlg.cpp removed
3. wxCustomDataObject docs finished


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-06 00:43:31 +00:00
Vadim Zeitlin
a1d58ddc15 wxFontEnumerator mostly works for wxMSW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-10-30 00:08:04 +00:00
Vadim Zeitlin
74b31181b3 1. Implemented support for different icons for different states (expanded, 
selected, combination of them) for the tree control (and doc'd it)
2. removed code which was sending extra event if wxFrame::SetSize() was
   used
3. important changes to wxWizard interface
4. small compilation corrections


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-09-29 22:47:56 +00:00
Vadim Zeitlin
0c5d3e1ccd 1. added a brief overview of Unicode support 
2. added and documented wxBITMAP() macros (as wxICON)
3. restructured wxFont class, added support of encoding parameter
4. regenerated makefiles to compile the new fontcmn.cpp file
5. corrected bug with non existing files in document-view history


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-09-29 19:02:07 +00:00
Julian Smart
e90babdf85 Added progdlgg.cpp to makefiles; fixed true/false in treectrl.h; made IsFree 
consistent (const omission)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-06-02 14:08:08 +00:00
Vadim Zeitlin
cc2b747254 wxWindow split (MSW part of changes) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-05-10 00:42:57 +00:00
Ove Kaaven
39ca6d790b Some Unicode changes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-04-19 17:47:19 +00:00
Julian Smart
c0ed460c2e Sorry folks, a lot of changes to remedy GetFont, GetBrush etc. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-12-08 23:26:18 +00:00
Julian Smart
b823f5a145 Miscellaneous, mostly cosmetic changes. wxPen/wxFont/wxBrush altered so Set... 
functions don't change shared objects.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-08-09 16:46:37 +00:00
Julian Smart
bbcdf8bc7c Fixed various wxMSW compile problems that came down the telephone line... 
plus wxTreeCtrl::EditLabel/EndEditLabel, dialog editor stuff, wxMSW header changes,
doc changes. Sorry about the quantity :-(


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-08-07 23:52:45 +00:00
Julian Smart
debe6624c1 Sorry, I went and removed consts as per the style guide :-) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-07-04 15:17:59 +00:00
Karsten Ballüder
2bda0e1738 added some wxMSW stuff 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-05-20 14:12:05 +00:00