Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,688 Commits 1 Branch 330 Tags
8955b4b2fbb9552a2c4ca5b4cb99bb24a58d2c46
Commit Graph

58 Commits

Author SHA1 Message Date
Vadim Zeitlin
8955b4b2fb Fix wxX11 build after fractional point size changes 
Define {Get,Set}FractionalPointSize() in wxX11 wxFont implementation.

Note that only Pango-based version really supports floating point sizes
as XLFD can't express them.
 2018-09-17 15:24:40 +02:00
Vadim Zeitlin
979d541072 Implement arbitrary font weight support for wxX11 
This is mostly done to fix (half of) compilation errors after
introduction of pure virtual wxFont::{Get,Set}NumericWeight() as wxFont
in wxX11 couldn't be compiled any more as it didn't define them.
 2018-09-06 03:13:23 +02:00
Jouk
4c29056ea4 include wxcrtvararg.h (non precomp) for wxVsnprintf/wxSscanf 2018-08-31 12:42:46 +02:00
Jouk Jansen
3cb2392abc Correction on commit #78099 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-11-11 07:46:00 +00:00
Jouk Jansen
df5b5baab3 Implement wxNativeFontInfo::GetStrikethrough() for wxX11 without pango 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-11-07 15:14:19 +00:00
Vadim Zeitlin
01c1dde264 Avoid deprecated wxPen/wxBrush/wxFont API in wxX11 code. 
Also simplify the code by relying on implicit constructors of wxPen and
wxBrush from wxColour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-09-23 17:45:10 +00:00
Vadim Zeitlin
db0d7e67a9 set enc to wxUnusedVar in unicode mode, remove the old ugly code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-09-23 17:42:03 +00:00
Vadim Zeitlin
08603120f4 in unicode, we did not need the font encoding parameter 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-09-23 17:42:00 +00:00
Vadim Zeitlin
df00ba55e0 adjust code to apply the wx coding guidelines 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-09-23 17:41:57 +00:00
Vadim Zeitlin
c973dd7be5 the font data have to stroe in m_nativeFontInfo, otherwise the constructor that use wxNavtiveFontInfo as parameter could not retrive the data in it. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-09-23 17:41:51 +00:00
Vadim Zeitlin
d2573ed255 Add get/set strikeline support to wxFont/x11. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-09-23 17:41:48 +00:00
Vadim Zeitlin
8e238e367e wxX11 wxFont miss the wxFont (const wxString &nativeInfoString) ctor, it will cause build tests failed. Added and fixed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-09-23 17:38:51 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword. 
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-26 16:02:46 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk. 
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-05-03 16:29:04 +00:00
Stefan Csomor
46b03af7ae common rtti in fontcmn.cpp 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-07 22:01:22 +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
8462a84b2c Removed wxFont::Set/GetNoAntiAliasing() implementations. 
Most of them were dummy and didn't do anything and this API was never meant to
be used anyhow.

Keep just the declarations in wxFontBase but mark them as deprecated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-09 13:04:59 +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
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-19 13:55:27 +00:00
Jouk Jansen
ae39129521 changing depricated font-family enums into current ones 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-06 08:12:48 +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
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-02 02:39:52 +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
Jouk Jansen
e97e6073b3 src/X11/font.cpp needs smae change as other wxXXX versions 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-09 09:20:32 +00:00
Vadim Zeitlin
cb5ec61f65 don't use font sizes less than 1 with Pango (remaining part of patch 1671684); refactor the font size setting code to eliminate duplication 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-08 00:44:54 +00:00
Vadim Zeitlin
3d63133a5e use facename in wxFontRefData::Init() in Unicode build (part of patch 1671684) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-08 00:40:38 +00:00
Václav Slavík
68c957045a don't expose M_FONTDATA in public header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-20 16:21:08 +00:00
Václav Slavík
873fd4af5f don't expose M_FONTDATA in public header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-20 16:14:01 +00:00
Julian Smart
15a187a6b2 Account for PANGO_WEIGHT_SEMIBOLD not being available on older Pango 
installations


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-04 17:09:48 +00:00
Vadim Zeitlin
514401354c handle PANGO_WEIGHT_SEMIBOLD font weight (avoids gcc warnings and generally makes sense) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-30 21:45:10 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-05 20:47:48 +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
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
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-24 07:16:32 +00:00
Włodzimierz Skiba
de6185e212 Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-02 10:39:23 +00:00
Włodzimierz Skiba
df91131cb0 Include wx/string.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-24 08:46:59 +00:00
Włodzimierz Skiba
7520f3da33 wx/wxprec.h already includes wx/defs.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-18 09:56:17 +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
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
Mart Raudsepp
5844fc0775 [wxX11] a ROMAN font is with serifs and a SWISS font is without. Set the font to "serif" if it's wxFONTFAMILY_ROMAN 
not wxFONTFAMILY_SWISS.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 21:58:32 +00:00
Julian Smart
97bdb4c890 Don't use native font always. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-06-10 14:57:11 +00:00
Julian Smart
69ffc7b206 Allow native font specification 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-06-09 09:37:28 +00:00
Julian Smart
6811251bfc Fix memory leak (closes bug 1191328) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-21 20:18:25 +00:00
Stefan Csomor
5ac2e80ca2 making getter const 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-14 16:33:17 +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
Jouk Jansen
a371f70393 Committing in . 
wxX11 for OpenVMS (phase 3)
   -minimal.exe for OpenVMS now builds and displays a window but crashes when
    trying to use the menus.

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/include/wx/vms_x_fix.h
 	wxWidgets/lib/VMS_X11_UNIV.OPT
 	wxWidgets/samples/minimal/descrip.mms
 	wxWidgets/src/univ/descrip.mms wxWidgets/src/x11/app.cpp
 	wxWidgets/src/x11/descrip.mms wxWidgets/src/x11/font.cpp
 	wxWidgets/src/x11/gsockx11.cpp wxWidgets/src/x11/utilsx.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-03-19 15:48:03 +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
14f355c2b5 added support for gcc precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-09 12:46:53 +00:00