projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simpler implementation that also works over remote connections by Kevin O.
[wxWidgets.git]
/
src
/
os2
/
font.cpp
diff --git
a/src/os2/font.cpp
b/src/os2/font.cpp
index 158b31fb0fc035916845d82550a15c60d4069035..80ebeb2682f68bc4515008866fe14131423421ec 100644
(file)
--- a/
src/os2/font.cpp
+++ b/
src/os2/font.cpp
@@
-1,14
+1,17
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: font.cpp
+// Name:
src/os2/
font.cpp
// Purpose: wxFont class
// Author: David Webster
// Modified by:
// Created: 10/06/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
// Purpose: wxFont class
// Author: David Webster
// Modified by:
// Created: 10/06/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
// ============================================================================
// declarations
// ============================================================================
// ============================================================================
// declarations
// ============================================================================
@@
-17,17
+20,13
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
- #include <malloc.h>
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
+#include "wx/font.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#ifndef WX_PRECOMP
#include <stdio.h>
- #include "wx/setup.h"
#include "wx/list.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/list.h"
#include "wx/utils.h"
#include "wx/app.h"
- #include "wx/font.h"
#include "wx/log.h"
#endif // WX_PRECOMP
#include "wx/log.h"
#endif // WX_PRECOMP
@@
-39,7
+38,7
@@
#include "wx/tokenzr.h"
#include "wx/tokenzr.h"
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+#include <malloc.h>
// ----------------------------------------------------------------------------
// wxFontRefData - the internal description of the font
// ----------------------------------------------------------------------------
// wxFontRefData - the internal description of the font
@@
-50,14
+49,14
@@
class WXDLLEXPORT wxFontRefData: public wxGDIRefData
public:
wxFontRefData()
{
public:
wxFontRefData()
{
- Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
FALSE
,
-
""
, wxFONTENCODING_DEFAULT);
+ Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
false
,
+
wxEmptyString
, wxFONTENCODING_DEFAULT);
}
wxFontRefData( int nSize
}
wxFontRefData( int nSize
- ,
int
nFamily
- ,
int
nStyle
- ,
int
nWeight
+ ,
wxFontFamily
nFamily
+ ,
wxFontStyle
nStyle
+ ,
wxFontWeight
nWeight
,bool bUnderlined
,const wxString& sFaceName
,wxFontEncoding vEncoding
,bool bUnderlined
,const wxString& sFaceName
,wxFontEncoding vEncoding
@@
-119,18
+118,18
@@
public:
return m_nPointSize;
}
return m_nPointSize;
}
- inline
int
GetFamily(void) const
+ inline
wxFontFamily
GetFamily(void) const
{
return m_nFamily;
}
{
return m_nFamily;
}
- inline
int
GetStyle(void) const
+ inline
wxFontStyle
GetStyle(void) const
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
: m_nStyle;
}
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
: m_nStyle;
}
- inline
in
t GetWeight(void) const
+ inline
wxFontWeigh
t GetWeight(void) const
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
: m_nWeight;
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
: m_nWeight;
@@
-174,33
+173,34
@@
public:
m_nPointSize = nPointSize;
}
m_nPointSize = nPointSize;
}
- inline void SetFamily(
int
nFamily)
+ inline void SetFamily(
wxFontFamily
nFamily)
{
m_nFamily = nFamily;
}
{
m_nFamily = nFamily;
}
- inline void SetStyle(
int
nStyle)
+ inline void SetStyle(
wxFontStyle
nStyle)
{
if (m_bNativeFontInfoOk)
{
if (m_bNativeFontInfoOk)
- m_vNativeFontInfo.SetStyle(
(wxFontStyle)
nStyle);
+ m_vNativeFontInfo.SetStyle(nStyle);
else
m_nStyle = nStyle;
}
else
m_nStyle = nStyle;
}
- inline void SetWeight(
in
t nWeight)
+ inline void SetWeight(
wxFontWeigh
t nWeight)
{
if (m_bNativeFontInfoOk)
{
if (m_bNativeFontInfoOk)
- m_vNativeFontInfo.SetWeight(
(wxFontWeight)
nWeight);
+ m_vNativeFontInfo.SetWeight(nWeight);
else
m_nWeight = nWeight;
}
else
m_nWeight = nWeight;
}
- inline
void
SetFaceName(const wxString& sFaceName)
+ inline
bool
SetFaceName(const wxString& sFaceName)
{
if (m_bNativeFontInfoOk)
{
if (m_bNativeFontInfoOk)
- m_vNativeFontInfo.SetFaceName(sFaceName);
+
return
m_vNativeFontInfo.SetFaceName(sFaceName);
else
m_sFaceName = sFaceName;
else
m_sFaceName = sFaceName;
+ return true;
}
inline void SetUnderlined(bool bUnderlined)
}
inline void SetUnderlined(bool bUnderlined)
@@
-247,9
+247,9
@@
protected:
// Common part of all ctors
//
void Init( int nSize
// Common part of all ctors
//
void Init( int nSize
- ,
int
nFamily
- ,
int
nStyle
- ,
int
nWeight
+ ,
wxFontFamily
nFamily
+ ,
wxFontStyle
nStyle
+ ,
wxFontWeight
nWeight
,bool bUnderlined
,const wxString& rsFaceName
,wxFontEncoding vEncoding
,bool bUnderlined
,const wxString& rsFaceName
,wxFontEncoding vEncoding
@@
-260,7
+260,7
@@
protected:
,WXHANDLE hPS = 0
);
//
,WXHANDLE hPS = 0
);
//
- // If
TRUE
, the pointer to the actual font is temporary and SHOULD NOT BE
+ // If
true
, the pointer to the actual font is temporary and SHOULD NOT BE
// DELETED by destructor
//
bool m_bTemporary;
// DELETED by destructor
//
bool m_bTemporary;
@@
-270,9
+270,9
@@
protected:
// Font characterstics
//
int m_nPointSize;
// Font characterstics
//
int m_nPointSize;
-
int
m_nFamily;
-
int
m_nStyle;
-
int
m_nWeight;
+
wxFontFamily
m_nFamily;
+
wxFontStyle
m_nStyle;
+
wxFontWeight
m_nWeight;
bool m_bUnderlined;
wxString m_sFaceName;
wxFontEncoding m_vEncoding;
bool m_bUnderlined;
wxString m_sFaceName;
wxFontEncoding m_vEncoding;
@@
-295,6
+295,8
@@
protected:
bool m_bInternalPS; // Internally generated PS?
}; // end of CLASS wxFontRefData
bool m_bInternalPS; // Internally generated PS?
}; // end of CLASS wxFontRefData
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
// ============================================================================
// implementation
// ============================================================================
// ============================================================================
// implementation
// ============================================================================
@@
-305,9
+307,9
@@
protected:
void wxFontRefData::Init(
int nPointSize
void wxFontRefData::Init(
int nPointSize
-,
int
nFamily
-,
int
nStyle
-,
int
nWeight
+,
wxFontFamily
nFamily
+,
wxFontStyle
nStyle
+,
wxFontWeight
nWeight
, bool bUnderlined
, const wxString& rsFaceName
, wxFontEncoding vEncoding
, bool bUnderlined
, const wxString& rsFaceName
, wxFontEncoding vEncoding
@@
-323,10
+325,10
@@
void wxFontRefData::Init(
m_vEncoding = vEncoding;
m_hFont = 0;
m_vEncoding = vEncoding;
m_hFont = 0;
- m_bNativeFontInfoOk =
FALSE
;
+ m_bNativeFontInfoOk =
false
;
m_nFontId = 0;
m_nFontId = 0;
- m_bTemporary =
FALSE
;
+ m_bTemporary =
false
;
m_pFM = (PFONTMETRICS)NULL;
m_hPS = NULLHANDLE;
m_nNumFonts = 0;
m_pFM = (PFONTMETRICS)NULL;
m_hPS = NULLHANDLE;
m_nNumFonts = 0;
@@
-347,19
+349,19
@@
void wxFontRefData::Init(
m_hFont = hFont;
m_nFontId = (int)hFont;
m_hFont = hFont;
m_nFontId = (int)hFont;
- m_bNativeFontInfoOk =
TRUE
;
+ m_bNativeFontInfoOk =
true
;
m_vNativeFontInfo = rInfo;
if (hPS == NULLHANDLE)
{
m_hPS = ::WinGetPS(HWND_DESKTOP);
m_vNativeFontInfo = rInfo;
if (hPS == NULLHANDLE)
{
m_hPS = ::WinGetPS(HWND_DESKTOP);
- m_bInternalPS =
TRUE
;
+ m_bInternalPS =
true
;
}
else
m_hPS = (HPS)hPS;
m_nFontId = 0;
}
else
m_hPS = (HPS)hPS;
m_nFontId = 0;
- m_bTemporary =
FALSE
;
+ m_bTemporary =
false
;
m_pFM = (PFONTMETRICS)NULL;
m_nNumFonts = 0;
} // end of wxFontRefData::Init
m_pFM = (PFONTMETRICS)NULL;
m_nNumFonts = 0;
} // end of wxFontRefData::Init
@@
-369,9
+371,7
@@
wxFontRefData::~wxFontRefData()
Free();
}
Free();
}
-bool wxFontRefData::Alloc(
- wxFont* pFont
-)
+bool wxFontRefData::Alloc( wxFont* pFont )
{
wxString sFaceName;
long flId = m_hFont;
{
wxString sFaceName;
long flId = m_hFont;
@@
-389,7
+389,7
@@
bool wxFontRefData::Alloc(
,sFaceName
,pFont
);
,sFaceName
,pFont
);
- m_bNativeFontInfoOk =
TRUE
;
+ m_bNativeFontInfoOk =
true
;
}
else
{
}
else
{
@@
-413,7
+413,7
@@
bool wxFontRefData::Alloc(
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogLastError(
"CreateFont"
);
+ wxLogLastError(
wxT("CreateFont")
);
}
::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
}
::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
@@
-432,37
+432,37
@@
bool wxFontRefData::Alloc(
// and face name.
//
if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)
// and face name.
//
if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)
- m_nFamily = wxROMAN;
+ m_nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)
- m_nFamily = wxROMAN;
+ m_nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
- m_nFamily = wxROMAN;
+ m_nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
- m_nFamily = wxROMAN;
+ m_nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
- m_nFamily = wxDECORATIVE;
+ m_nFamily = wx
FONTFAMILY_
DECORATIVE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)
- m_nFamily = wxSCRIPT;
+ m_nFamily = wx
FONTFAMILY_
SCRIPT;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
- m_nFamily = wxTELETYPE;
+ m_nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)
- m_nFamily = wxTELETYPE;
+ m_nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
- m_nFamily = wxTELETYPE;
+ m_nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
- m_nFamily = wxMODERN;
+ m_nFamily = wx
FONTFAMILY_
MODERN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
- m_nFamily = wxMODERN;
+ m_nFamily = wx
FONTFAMILY_
MODERN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
else
else
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC)
m_nStyle = wxFONTSTYLE_ITALIC;
if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC)
m_nStyle = wxFONTSTYLE_ITALIC;
@@
-494,7
+494,7
@@
bool wxFontRefData::Alloc(
m_nWeight = wxFONTWEIGHT_NORMAL;
}
m_bUnderlined = ((m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0);
m_nWeight = wxFONTWEIGHT_NORMAL;
}
m_bUnderlined = ((m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0);
- m_sFaceName = m_vNativeFontInfo.fa.szFacename;
+ m_sFaceName =
(wxChar*)
m_vNativeFontInfo.fa.szFacename;
m_vEncoding = wxGetFontEncFromCharSet(m_vNativeFontInfo.fa.usCodePage);
//
m_vEncoding = wxGetFontEncFromCharSet(m_vNativeFontInfo.fa.usCodePage);
//
@@
-514,7
+514,7
@@
bool wxFontRefData::Alloc(
// Select the font into the Presentation space
//
::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
// Select the font into the Presentation space
//
::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
- return
TRUE
;
+ return
true
;
} // end of wxFontRefData::Alloc
void wxFontRefData::Free()
} // end of wxFontRefData::Alloc
void wxFontRefData::Free()
@@
-582,7
+582,7
@@
bool wxNativeFontInfo::GetUnderlined() const
wxString wxNativeFontInfo::GetFaceName() const
{
wxString wxNativeFontInfo::GetFaceName() const
{
- return fm.szFacename;
+ return
(wxChar*)
fm.szFacename;
} // end of wxNativeFontInfo::GetFaceName
wxFontFamily wxNativeFontInfo::GetFamily() const
} // end of wxNativeFontInfo::GetFaceName
wxFontFamily wxNativeFontInfo::GetFamily() const
@@
-593,37
+593,37
@@
wxFontFamily wxNativeFontInfo::GetFamily() const
// Extract family from facename
//
if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
// Extract family from facename
//
if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
- nFamily = wxROMAN;
+ nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)
else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)
- nFamily = wxROMAN;
+ nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
- nFamily = wxROMAN;
+ nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
- nFamily = wxROMAN;
+ nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
- nFamily = wxDECORATIVE;
+ nFamily = wx
FONTFAMILY_
DECORATIVE;
else if (strcmp(fm.szFamilyname, "Helvetica") == 0)
else if (strcmp(fm.szFamilyname, "Helvetica") == 0)
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(fm.szFamilyname, "Helv") == 0)
else if (strcmp(fm.szFamilyname, "Helv") == 0)
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(fm.szFamilyname, "Script") == 0)
else if (strcmp(fm.szFamilyname, "Script") == 0)
- nFamily = wxSCRIPT;
+ nFamily = wx
FONTFAMILY_
SCRIPT;
else if (strcmp(fm.szFamilyname, "Courier New") == 0)
else if (strcmp(fm.szFamilyname, "Courier New") == 0)
- nFamily = wxTELETYPE;
+ nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(fm.szFamilyname, "Courier") == 0)
else if (strcmp(fm.szFamilyname, "Courier") == 0)
- nFamily = wxTELETYPE;
+ nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
- nFamily = wxTELETYPE;
+ nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(fm.szFamilyname, "System VIO") == 0)
else if (strcmp(fm.szFamilyname, "System VIO") == 0)
- nFamily = wxMODERN;
+ nFamily = wx
FONTFAMILY_
MODERN;
else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
- nFamily = wxMODERN;
+ nFamily = wx
FONTFAMILY_
MODERN;
else if (strcmp(fm.szFamilyname, "Arial") == 0)
else if (strcmp(fm.szFamilyname, "Arial") == 0)
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(fm.szFamilyname, "Swiss") == 0)
else if (strcmp(fm.szFamilyname, "Swiss") == 0)
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
else
else
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
return (wxFontFamily)nFamily;
} // end of wxNativeFontInfo::GetFamily
return (wxFontFamily)nFamily;
} // end of wxNativeFontInfo::GetFamily
@@
-646,7
+646,7
@@
void wxNativeFontInfo::SetStyle(
switch (eStyle)
{
default:
switch (eStyle)
{
default:
- wxFAIL_MSG(
_
T("unknown font style") );
+ wxFAIL_MSG(
wx
T("unknown font style") );
// fall through
case wxFONTSTYLE_NORMAL:
// fall through
case wxFONTSTYLE_NORMAL:
@@
-666,7
+666,7
@@
void wxNativeFontInfo::SetWeight(
switch (eWeight)
{
default:
switch (eWeight)
{
default:
- wxFAIL_MSG(
_
T("unknown font weight") );
+ wxFAIL_MSG(
wx
T("unknown font weight") );
// fall through
case wxFONTWEIGHT_NORMAL:
// fall through
case wxFONTWEIGHT_NORMAL:
@@
-691,11
+691,12
@@
void wxNativeFontInfo::SetUnderlined(
fa.fsSelection |= FATTR_SEL_UNDERSCORE;
} // end of wxNativeFontInfo::SetUnderlined
fa.fsSelection |= FATTR_SEL_UNDERSCORE;
} // end of wxNativeFontInfo::SetUnderlined
-
void
wxNativeFontInfo::SetFaceName(
-
wxString
sFacename
+
bool
wxNativeFontInfo::SetFaceName(
+
const wxString&
sFacename
)
{
)
{
- wxStrncpy(fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+ wxStrlcpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+ return true;
} // end of wxNativeFontInfo::SetFaceName
void wxNativeFontInfo::SetFamily(
} // end of wxNativeFontInfo::SetFaceName
void wxNativeFontInfo::SetFamily(
@@
-706,44
+707,42
@@
void wxNativeFontInfo::SetFamily(
switch (eFamily)
{
switch (eFamily)
{
- case wxSCRIPT:
+ case wx
FONTFAMILY_
SCRIPT:
sFacename = wxT("Tms Rmn");
break;
sFacename = wxT("Tms Rmn");
break;
- case wxDECORATIVE:
+ case wx
FONTFAMILY_
DECORATIVE:
sFacename = wxT("WarpSans");
break;
sFacename = wxT("WarpSans");
break;
- case wxROMAN:
+ case wx
FONTFAMILY_
ROMAN:
sFacename = wxT("Tms Rmn");
break;
sFacename = wxT("Tms Rmn");
break;
- case wxTELETYPE:
+ case wx
FONTFAMILY_
TELETYPE:
sFacename = wxT("Courier") ;
break;
sFacename = wxT("Courier") ;
break;
- case wxMODERN:
+ case wx
FONTFAMILY_
MODERN:
sFacename = wxT("System VIO") ;
break;
sFacename = wxT("System VIO") ;
break;
- case wxSWISS:
+ case wx
FONTFAMILY_
SWISS:
sFacename = wxT("Helv") ;
break;
sFacename = wxT("Helv") ;
break;
- case wxDEFAULT:
+ case wx
FONTFAMILY_
DEFAULT:
default:
sFacename = wxT("System VIO") ;
}
default:
sFacename = wxT("System VIO") ;
}
- if (!wxStrlen(fa.szFacename) )
+ if (!wxStrlen(
(wxChar*)
fa.szFacename) )
{
SetFaceName(sFacename);
}
} // end of wxNativeFontInfo::SetFamily
{
SetFaceName(sFacename);
}
} // end of wxNativeFontInfo::SetFamily
-void wxNativeFontInfo::SetEncoding(
- wxFontEncoding eEncoding
-)
+void wxNativeFontInfo::SetEncoding( wxFontEncoding eEncoding )
{
wxNativeEncodingInfo vInfo;
{
wxNativeEncodingInfo vInfo;
@@
-771,82
+770,80
@@
void wxNativeFontInfo::SetEncoding(
vInfo.charset = 850;
}
}
vInfo.charset = 850;
}
}
- fa.usCodePage = vInfo.charset;
+ fa.usCodePage =
(USHORT)
vInfo.charset;
} // end of wxNativeFontInfo::SetFaceName
} // end of wxNativeFontInfo::SetFaceName
-bool wxNativeFontInfo::FromString(
- const wxString& rsStr
-)
+bool wxNativeFontInfo::FromString( const wxString& rsStr )
{
long lVal;
{
long lVal;
- wxStringTokenizer vTokenizer(rsStr,
_
T(";"));
+ wxStringTokenizer vTokenizer(rsStr,
wx
T(";"));
//
// First the version
//
wxString sToken = vTokenizer.GetNextToken();
//
// First the version
//
wxString sToken = vTokenizer.GetNextToken();
- if (sToken !=
_
T('0'))
- return
FALSE
;
+ if (sToken !=
wx
T('0'))
+ return
false
;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fm.lEmHeight = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
fm.lEmHeight = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fa.lAveCharWidth = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
fa.lAveCharWidth = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fa.fsSelection = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
fa.fsSelection = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fa.fsType = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
fa.fsType = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fa.fsFontUse = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
fa.fsFontUse = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fa.idRegistry = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
fa.idRegistry = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fa.usCodePage = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
fa.usCodePage = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fa.lMatch = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
fa.lMatch = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
- return
FALSE
;
+ return
false
;
fn.usWeightClass = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if(!sToken)
fn.usWeightClass = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if(!sToken)
- return
FALSE
;
- wxStrcpy(fa.szFacename, sToken.c_str());
- return
TRUE
;
+ return
false
;
+ wxStrcpy(
(wxChar*)
fa.szFacename, sToken.c_str());
+ return
true
;
} // end of wxNativeFontInfo::FromString
wxString wxNativeFontInfo::ToString() const
{
wxString sStr;
} // end of wxNativeFontInfo::FromString
wxString wxNativeFontInfo::ToString() const
{
wxString sStr;
- sStr.Printf(
_
T("%d;%ld;%ld;%ld;%d;%d;%d;%d;%d;%ld;%d;%s"),
+ sStr.Printf(
wx
T("%d;%ld;%ld;%ld;%d;%d;%d;%d;%d;%ld;%d;%s"),
0, // version, in case we want to change the format later
fm.lEmHeight,
fa.lAveCharWidth,
0, // version, in case we want to change the format later
fm.lEmHeight,
fa.lAveCharWidth,
@@
-858,7
+855,7
@@
wxString wxNativeFontInfo::ToString() const
fa.usCodePage,
fa.lMatch,
fn.usWeightClass,
fa.usCodePage,
fa.lMatch,
fn.usWeightClass,
- fa.szFacename);
+
(char *)
fa.szFacename);
return sStr;
} // end of wxNativeFontInfo::ToString
return sStr;
} // end of wxNativeFontInfo::ToString
@@
-866,21
+863,15
@@
wxString wxNativeFontInfo::ToString() const
// wxFont
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
-void wxFont::Init()
-{
-} // end of wxFont::Init
-
-bool wxFont::Create(
- const wxNativeFontInfo& rInfo
-, WXHFONT hFont
-)
+bool wxFont::Create( const wxNativeFontInfo& rInfo,
+ WXHFONT hFont )
{
UnRef();
m_refData = new wxFontRefData( rInfo
,hFont
);
RealizeResource();
{
UnRef();
m_refData = new wxFontRefData( rInfo
,hFont
);
RealizeResource();
- return
TRUE
;
+ return
true
;
} // end of wxFont::Create
wxFont::wxFont(
} // end of wxFont::Create
wxFont::wxFont(
@@
-897,15
+888,13
@@
wxFont::wxFont(
// Constructor for a font. Note that the real construction is done
// in wxDC::SetFont, when information is available about scaling etc.
// ----------------------------------------------------------------------------
// Constructor for a font. Note that the real construction is done
// in wxDC::SetFont, when information is available about scaling etc.
// ----------------------------------------------------------------------------
-bool wxFont::Create(
- int nPointSize
-, int nFamily
-, int nStyle
-, int nWeight
-, bool bUnderlined
-, const wxString& rsFaceName
-, wxFontEncoding vEncoding
-)
+bool wxFont::Create( int nPointSize,
+ wxFontFamily nFamily,
+ wxFontStyle nStyle,
+ wxFontWeight nWeight,
+ bool bUnderlined,
+ const wxString& rsFaceName,
+ wxFontEncoding vEncoding )
{
UnRef();
{
UnRef();
@@
-926,7
+915,7
@@
bool wxFont::Create(
,vEncoding
);
RealizeResource();
,vEncoding
);
RealizeResource();
- return
TRUE
;
+ return
true
;
} // end of wxFont::Create
wxFont::~wxFont()
} // end of wxFont::Create
wxFont::~wxFont()
@@
-936,32
+925,40
@@
wxFont::~wxFont()
// ----------------------------------------------------------------------------
// real implementation
// Boris' Kovalenko comments:
// ----------------------------------------------------------------------------
// real implementation
// Boris' Kovalenko comments:
-// Because OS/2 fonts are associated with PS we can
not create the font
+// Because OS/2 fonts are associated with PS we cannot create the font
// here, but we may check that font definition is true
// ----------------------------------------------------------------------------
// here, but we may check that font definition is true
// ----------------------------------------------------------------------------
+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+ return new wxFontRefData();
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+ return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
+}
+
bool wxFont::RealizeResource()
{
if ( GetResourceHandle() )
{
bool wxFont::RealizeResource()
{
if ( GetResourceHandle() )
{
- return
TRUE
;
+ return
true
;
}
return M_FONTDATA->Alloc(this);
} // end of wxFont::RealizeResource
}
return M_FONTDATA->Alloc(this);
} // end of wxFont::RealizeResource
-bool wxFont::FreeResource(
- bool bForce
-)
+bool wxFont::FreeResource( bool WXUNUSED(bForce) )
{
if (GetResourceHandle())
{
M_FONTDATA->Free();
{
if (GetResourceHandle())
{
M_FONTDATA->Free();
- return
TRUE
;
+ return
true
;
}
}
- return
FALSE
;
+ return
false
;
} // end of wxFont::FreeResource
} // end of wxFont::FreeResource
-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle()
const
{
return GetHFONT();
} // end of wxFont::GetResourceHandle
{
return GetHFONT();
} // end of wxFont::GetResourceHandle
@@
-976,21
+973,6
@@
bool wxFont::IsFree() const
return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0);
} // end of wxFont::IsFree
return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0);
} // end of wxFont::IsFree
-void wxFont::Unshare()
-{
- // Don't change shared data
- if ( !m_refData )
- {
- m_refData = new wxFontRefData();
- }
- else
- {
- wxFontRefData* ref = new wxFontRefData(*M_FONTDATA);
- UnRef();
- m_refData = ref;
- }
-} // end of wxFont::Unshare
-
// ----------------------------------------------------------------------------
// change font attribute: we recreate font when doing it
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// change font attribute: we recreate font when doing it
// ----------------------------------------------------------------------------
@@
-999,7
+981,7
@@
void wxFont::SetPointSize(
int nPointSize
)
{
int nPointSize
)
{
-
Unshar
e();
+
AllocExclusiv
e();
M_FONTDATA->SetPointSize(nPointSize);
M_FONTDATA->SetPointSize(nPointSize);
@@
-1007,10
+989,10
@@
void wxFont::SetPointSize(
} // end of wxFont::SetPointSize
void wxFont::SetFamily(
} // end of wxFont::SetPointSize
void wxFont::SetFamily(
-
int
nFamily
+
wxFontFamily
nFamily
)
{
)
{
-
Unshar
e();
+
AllocExclusiv
e();
M_FONTDATA->SetFamily(nFamily);
M_FONTDATA->SetFamily(nFamily);
@@
-1018,10
+1000,10
@@
void wxFont::SetFamily(
} // end of wxFont::SetFamily
void wxFont::SetStyle(
} // end of wxFont::SetFamily
void wxFont::SetStyle(
-
int
nStyle
+
wxFontStyle
nStyle
)
{
)
{
-
Unshar
e();
+
AllocExclusiv
e();
M_FONTDATA->SetStyle(nStyle);
M_FONTDATA->SetStyle(nStyle);
@@
-1029,32
+1011,34
@@
void wxFont::SetStyle(
} // end of wxFont::SetStyle
void wxFont::SetWeight(
} // end of wxFont::SetStyle
void wxFont::SetWeight(
-
int
nWeight
+
wxFontWeight
nWeight
)
{
)
{
-
Unshar
e();
+
AllocExclusiv
e();
M_FONTDATA->SetWeight(nWeight);
RealizeResource();
} // end of wxFont::SetWeight
M_FONTDATA->SetWeight(nWeight);
RealizeResource();
} // end of wxFont::SetWeight
-
void
wxFont::SetFaceName(
+
bool
wxFont::SetFaceName(
const wxString& rsFaceName
)
{
const wxString& rsFaceName
)
{
-
Unshar
e();
+
AllocExclusiv
e();
- M_FONTDATA->SetFaceName(rsFaceName);
+
bool refdataok =
M_FONTDATA->SetFaceName(rsFaceName);
RealizeResource();
RealizeResource();
+
+ return refdataok && wxFontBase::SetFaceName(rsFaceName);
} // end of wxFont::SetFaceName
void wxFont::SetUnderlined(
bool bUnderlined
)
{
} // end of wxFont::SetFaceName
void wxFont::SetUnderlined(
bool bUnderlined
)
{
-
Unshar
e();
+
AllocExclusiv
e();
M_FONTDATA->SetUnderlined(bUnderlined);
M_FONTDATA->SetUnderlined(bUnderlined);
@@
-1065,7
+1049,7
@@
void wxFont::SetEncoding(
wxFontEncoding vEncoding
)
{
wxFontEncoding vEncoding
)
{
-
Unshar
e();
+
AllocExclusiv
e();
M_FONTDATA->SetEncoding(vEncoding);
M_FONTDATA->SetEncoding(vEncoding);
@@
-1076,7
+1060,7
@@
void wxFont::DoSetNativeFontInfo(
const wxNativeFontInfo& rInfo
)
{
const wxNativeFontInfo& rInfo
)
{
-
Unshar
e();
+
AllocExclusiv
e();
FreeResource();
FreeResource();
@@
-1091,49
+1075,47
@@
void wxFont::DoSetNativeFontInfo(
int wxFont::GetPointSize() const
{
int wxFont::GetPointSize() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG(
Is
Ok(), 0, wxT("invalid font") );
return M_FONTDATA->GetPointSize();
} // end of wxFont::GetPointSize
return M_FONTDATA->GetPointSize();
} // end of wxFont::GetPointSize
-
int wxFont::
GetFamily() const
+
wxFontFamily wxFont::Do
GetFamily() const
{
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-
return M_FONTDATA->GetFamily();
return M_FONTDATA->GetFamily();
-} // end of wxFont::GetFamily
+} // end of wxFont::
Do
GetFamily
-
int
wxFont::GetStyle() const
+
wxFontStyle
wxFont::GetStyle() const
{
{
- wxCHECK_MSG(
Ok(), 0
, wxT("invalid font") );
+ wxCHECK_MSG(
IsOk(), wxFONTSTYLE_MAX
, wxT("invalid font") );
return M_FONTDATA->GetStyle();
} // end of wxFont::GetStyle
return M_FONTDATA->GetStyle();
} // end of wxFont::GetStyle
-
in
t wxFont::GetWeight() const
+
wxFontWeigh
t wxFont::GetWeight() const
{
{
- wxCHECK_MSG(
Ok(), 0
, wxT("invalid font") );
+ wxCHECK_MSG(
IsOk(), wxFONTWEIGHT_MAX
, wxT("invalid font") );
return M_FONTDATA->GetWeight();
}
bool wxFont::GetUnderlined() const
{
return M_FONTDATA->GetWeight();
}
bool wxFont::GetUnderlined() const
{
- wxCHECK_MSG(
Ok(), FALSE
, wxT("invalid font") );
+ wxCHECK_MSG(
IsOk(), false
, wxT("invalid font") );
return M_FONTDATA->GetUnderlined();
} // end of wxFont::GetUnderlined
wxString wxFont::GetFaceName() const
{
return M_FONTDATA->GetUnderlined();
} // end of wxFont::GetUnderlined
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG(
Ok(), wxT("")
, wxT("invalid font") );
+ wxCHECK_MSG(
IsOk(), wxEmptyString
, wxT("invalid font") );
return M_FONTDATA->GetFaceName();
} // end of wxFont::GetFaceName
wxFontEncoding wxFont::GetEncoding() const
{
return M_FONTDATA->GetFaceName();
} // end of wxFont::GetFaceName
wxFontEncoding wxFont::GetEncoding() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+ wxCHECK_MSG(
Is
Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
return M_FONTDATA->GetEncoding();
} // end of wxFont::GetEncoding
return M_FONTDATA->GetEncoding();
} // end of wxFont::GetEncoding
@@
-1147,24
+1129,18
@@
const wxNativeFontInfo* wxFont::GetNativeFontInfo() const
//
// Internal use only method to set the FONTMETRICS array
//
//
// Internal use only method to set the FONTMETRICS array
//
-void wxFont::SetFM(
- PFONTMETRICS pFM
-, int nNumFonts
-)
+void wxFont::SetFM( PFONTMETRICS pFM, int nNumFonts )
{
M_FONTDATA->SetFM(pFM);
M_FONTDATA->SetNumFonts(nNumFonts);
} // end of wxFont::SetFM
{
M_FONTDATA->SetFM(pFM);
M_FONTDATA->SetNumFonts(nNumFonts);
} // end of wxFont::SetFM
-void wxFont::SetPS(
- HPS hPS
-)
+void wxFont::SetPS( HPS hPS )
{
{
-
Unshar
e();
+
AllocExclusiv
e();
M_FONTDATA->SetPS(hPS);
RealizeResource();
} // end of wxFont::SetPS
M_FONTDATA->SetPS(hPS);
RealizeResource();
} // end of wxFont::SetPS
-