projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change fallback default for wx version to 27
[wxWidgets.git]
/
src
/
msw
/
font.cpp
diff --git
a/src/msw/font.cpp
b/src/msw/font.cpp
index d79b4b74a691bc9b81cffdec94b9e81b999cf1ea..d335ae6fce6bd48a49302192a12059344ca32b55 100644
(file)
--- a/
src/msw/font.cpp
+++ b/
src/msw/font.cpp
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "font.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-108,8
+104,8
@@
public:
// constructors
wxFontRefData()
{
// constructors
wxFontRefData()
{
- Init(-1, wxSize(0,
0), FALSE
, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
- wxFONTWEIGHT_NORMAL,
FALSE
, wxEmptyString,
+ Init(-1, wxSize(0,
0), false
, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+ wxFONTWEIGHT_NORMAL,
false
, wxEmptyString,
wxFONTENCODING_DEFAULT);
}
wxFONTENCODING_DEFAULT);
}
@@
-132,7
+128,7
@@
public:
Init(info, hFont);
}
Init(info, hFont);
}
- wxFontRefData(const wxFontRefData& data)
+ wxFontRefData(const wxFontRefData& data)
: wxGDIRefData()
{
if ( data.m_nativeFontInfoOk )
{
{
if ( data.m_nativeFontInfoOk )
{
@@
-223,7
+219,7
@@
public:
else
{
m_pointSize = pointSize;
else
{
m_pointSize = pointSize;
- m_sizeUsingPixels =
FALSE
;
+ m_sizeUsingPixels =
false
;
}
}
}
}
@@
-236,7
+232,7
@@
public:
else
{
m_pixelSize = pixelSize;
else
{
m_pixelSize = pixelSize;
- m_sizeUsingPixels =
TRUE
;
+ m_sizeUsingPixels =
true
;
}
}
}
}
@@
-506,16
+502,11
@@
wxFontEncoding wxNativeFontInfo::GetEncoding() const
void wxNativeFontInfo::SetPointSize(int pointsize)
{
void wxNativeFontInfo::SetPointSize(int pointsize)
{
-#if wxFONT_SIZE_COMPATIBILITY
- // Incorrect, but compatible with old wxWidgets behaviour
- lf.lfHeight = (pointSize*ppInch)/72;
-#else // wxFONT_SIZE_COMPATIBILITY
// FIXME: using the screen here results in incorrect font size calculation
// for printing!
const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);
// FIXME: using the screen here results in incorrect font size calculation
// for printing!
const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);
-#endif // wxFONT_SIZE_COMPATIBILITY/!wxFONT_SIZE_COMPATIBILITY
}
void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
}
void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
@@
-571,14
+562,14
@@
void wxNativeFontInfo::SetUnderlined(bool underlined)
lf.lfUnderline = underlined;
}
lf.lfUnderline = underlined;
}
-void wxNativeFontInfo::SetFaceName(
wxString
facename)
+void wxNativeFontInfo::SetFaceName(
const wxString&
facename)
{
wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName));
}
void wxNativeFontInfo::SetFamily(wxFontFamily family)
{
{
wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName));
}
void wxNativeFontInfo::SetFamily(wxFontFamily family)
{
-
int
ff_family;
+
BYTE
ff_family;
wxString facename;
switch ( family )
wxString facename;
switch ( family )
@@
-611,11
+602,19
@@
void wxNativeFontInfo::SetFamily(wxFontFamily family)
case wxDEFAULT:
default:
case wxDEFAULT:
default:
+ {
+ // We want Windows 2000 or later to have new fonts even MS Shell Dlg
+ // is returned as default GUI font for compatibility
+ int verMaj;
ff_family = FF_SWISS;
ff_family = FF_SWISS;
- facename = _T("MS Sans Serif");
+ if(wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
+ facename = _T("MS Shell Dlg 2");
+ else
+ facename = _T("MS Shell Dlg");
+ }
}
}
- lf.lfPitchAndFamily =
DEFAULT_PITCH
| ff_family;
+ lf.lfPitchAndFamily =
(BYTE)(DEFAULT_PITCH)
| ff_family;
if ( !wxStrlen(lf.lfFaceName) )
{
if ( !wxStrlen(lf.lfFaceName) )
{
@@
-647,7
+646,7
@@
void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
}
}
}
}
- lf.lfCharSet = info.charset;
+ lf.lfCharSet =
(BYTE)
info.charset;
}
bool wxNativeFontInfo::FromString(const wxString& s)
}
bool wxNativeFontInfo::FromString(const wxString& s)