Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,411 Commits 1 Branch 330 Tags
9b4670e5bcaeba0898d4aecd40c2bb0dc00f5de5
Commit Graph

92 Commits

Author SHA1 Message Date
Vadim Zeitlin
f76c3ff677 Round font sizes in AdjustToSymbolicSize() instead of truncating. 
This was mainly done to suppress g++ warning about implicit float to int
conversion but it also seems to make more sense to round the value here
instead of truncating it to int.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-06-16 15:13:49 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos. 
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-22 14:17:38 +00:00
Vadim Zeitlin
19da7aaa9b Add wxFont::SetSymbolicSize() and SetSymbolicSizeRelativeTo(). 
These methods allow to set the font size using CSS-like absolute size
specifications.

Notice that the factors used here are incompatible with (but better than) the
ones used in wxBuildFontSizes() in src/html/winpars.cpp. In the future it
would be nice to reuse the new wxFont functions in wxHTML code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-27 12:47:05 +00:00
Vadim Zeitlin
801423ee34 Add wxFont::Underlined() and MakeUnderlined() methods. 
Add two more helpers for consistency with the existing methods such as Bold()
and MakeBold().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-27 12:46:59 +00:00
Stefan Csomor
e765d7ee73 xti changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-07 17:49:18 +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
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
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
Vadim Zeitlin
6e7d2550ce wxFont::MakeXXX() and Scale() methods now modify the font in place; XXX() and Scaled() create new font 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-17 21:27:37 +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
Vadim Zeitlin
1a2ca1d673 deal with the fonts without any specified face name in wxNativeFontInfo::To/FromUserString() correctly by using the family as fallback 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-05-17 11:47:08 +00:00
Francesco Montorsi
f2c1b903bf small enhancement: account for SLANT==ITALIC on wxMSW; print explicitely the face name of the current font; make wxFontBase::GetFamilyString aware of wxFONTFAMILY_UNKNOWN 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-04-15 20:02:17 +00:00
Francesco Montorsi
c1ab2be0a0 implement quoting for the facename and parsing of quoted facenames in wxNativeFontInfo::To/FromUserString() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-25 12:21:56 +00:00
Vadim Zeitlin
61f24aea16 compilation fix for STL build after the last change 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-22 15:30:15 +00:00
Vadim Zeitlin
4b6a582bef replace more __WXDEBUG__ occurrences with wxDEBUG_LEVEL 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-22 12:53:48 +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
Francesco Montorsi
70f70818c2 return updated wxFONT*_* values 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-16 14:49:46 +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
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
Vadim Zeitlin
e822d1bd5f fix more Borland release build warnings about unused variable/code without effect 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-20 10:30:49 +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
fc9361e3ec added wxTo/FromString() overloads for wxFont (1st part of patch 1760073) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-27 23:49:08 +00:00
Vadim Zeitlin
ff42758536 added wxUSE_FONTENUM for wxFontEnumerator 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-21 02:20:00 +00:00
Vadim Zeitlin
ab29bb87b2 don't invalidate the font in SetNativeFontInfo[Desc]() to conform to the documented behaviour (patch 1743548) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-27 15:55:48 +00:00
Vadim Zeitlin
a38cd629d7 compilation fix for BCC 5.5: use IsSameAs() instead of accessing m_refData directly which somehow fails with this compiler 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-26 20:18:53 +00:00
Václav Slavík
d04f9b8e31 don't expose M_FONTDATA in public header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-20 16:43:55 +00:00
Václav Slavík
77f15ffe92 warning fix for !wxUSE_FONTMAP 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-16 10:31:48 +00:00
Vadim Zeitlin
82d0e7fe66 disable pixel size comparison in operator==() for wxGTK1 as it results in infinite recursion there 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-16 20:15:55 +00:00
Vadim Zeitlin
cc3de8a3fc take pixel sizes into account as well when comparing fonts, not just point sizes which could be the same for fonts with slightly different height in pixels or, worse, the fonts with the same height but compeltely different widths 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-02 12:47:59 +00:00
Włodzimierz Skiba
dd05139a80 Include wx/gdicmn.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-19 20:18:46 +00:00
Włodzimierz Skiba
7456f3828a Fail for assert(0,...). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-29 11:17:17 +00:00
Włodzimierz Skiba
7bd236e6da Fail for assert(0,...). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-29 10:10:37 +00:00
Włodzimierz Skiba
8d3ba63b1e Build fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-29 06:39:40 +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
Włodzimierz Skiba
da80ae712a Include wx/dc.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-05 22:58:39 +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
David Surovell
d141b21808 tweaks and comments to previous commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-06 22:53:31 +00:00
David Surovell
bf26e9e078 fix gcc v3.3.3 compiler crash 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-06 22:34:32 +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
452aa069dc Missing include. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-15 16:48:21 +00:00
Julian Smart
2a1f999faf Applied patch [ 1171542 ] access static class members via scoping operator 
Paul Cornett: A static class member can be accessed as X::member,
there is no need for an object or pointer (s.member or
p->member). There are also a few bugs with incorrect
usage of wxString::Format and wxString::FromAscii.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-30 16:49:41 +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
Dimitri Schoolwerth
8f7fa6f8f9 removed tab character 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-03 23:46:42 +00:00
Vadim Zeitlin
8093538cc5 oops, AdjustFontSize() had no effect; fixed (patch 1037952) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-03 13:38:22 +00:00
Dimitri Schoolwerth
c1ce7c1988 fixed MSVC6 warning 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-27 10:25:41 +00:00