Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added DoSetNativeFontInfo() to avoid virtual function hiding

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-02-12 15:42:27 +00:00
parent bf3353768a
commit 9045ad9dfc
14 changed files with 86 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/font.h
View File

@@ -171,7 +171,8 @@ public:
virtual void SetFaceName( const wxString& faceName ) = 0;
virtual void SetUnderlined( bool underlined ) = 0;
virtual void SetEncoding(wxFontEncoding encoding) = 0;
virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
void SetNativeFontInfo(const wxNativeFontInfo& info)
{ DoSetNativeFontInfo(info); }
void SetNativeFontInfo(const wxString& info);
void SetNativeFontInfoUserDesc(const wxString& info);
@@ -196,6 +197,9 @@ protected:
wxFontRefData *GetFontData() const
{ return (wxFontRefData *)m_refData; }
// the function called by both overloads of SetNativeFontInfo()
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
private:
// the currently default encoding: by default, it's the default system
// encoding, but may be changed by the application using

3
include/wx/gtk/font.h
View File

@@ -94,7 +94,6 @@ public:
virtual void SetFaceName( const wxString& faceName );
virtual void SetUnderlined( bool underlined );
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
virtual void SetNoAntiAliasing( bool no = TRUE );
virtual bool GetNoAntiAliasing();
@@ -109,6 +108,8 @@ public:
// no data :-)
protected:
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
// common part of all ctors
void Init();

3
include/wx/gtk1/font.h
View File

@@ -94,7 +94,6 @@ public:
virtual void SetFaceName( const wxString& faceName );
virtual void SetUnderlined( bool underlined );
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
virtual void SetNoAntiAliasing( bool no = TRUE );
virtual bool GetNoAntiAliasing();
@@ -109,6 +108,8 @@ public:
// no data :-)
protected:
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
// common part of all ctors
void Init();

3
include/wx/motif/font.h
View File

@@ -76,7 +76,6 @@ public:
virtual void SetFaceName(const wxString& faceName);
virtual void SetUnderlined(bool underlined);
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
// Implementation
@@ -102,6 +101,8 @@ public:
WXDisplay* display = NULL) const;
protected:
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
// common part of all ctors
void Init();

3
include/wx/msw/font.h
View File

@@ -81,7 +81,6 @@ public:
virtual void SetFaceName(const wxString& faceName);
virtual void SetUnderlined(bool underlined);
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
virtual bool IsFixedWidth() const;
@@ -102,6 +101,8 @@ public:
*/
protected:
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
// common part of all ctors
void Init();

4
include/wx/os2/font.h
View File

@@ -102,7 +102,6 @@ public:
virtual void SetFaceName(const wxString& rsFaceName);
virtual void SetUnderlined(bool bUnderlined);
virtual void SetEncoding(wxFontEncoding vEncoding);
virtual void SetNativeFontInfo(const wxNativeFontInfo& rInfo);
//
// For internal use only!
@@ -121,7 +120,10 @@ public:
virtual bool FreeResource(bool bForce = FALSE);
WXHFONT GetHFONT(void) const;
protected:
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
//
// Common part of all ctors
//

3
include/wx/x11/font.h
View File

@@ -82,7 +82,6 @@ public:
virtual void SetFaceName(const wxString& faceName);
virtual void SetUnderlined(bool underlined);
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
virtual void SetNoAntiAliasing( bool no = TRUE );
virtual bool GetNoAntiAliasing();
@@ -112,6 +111,8 @@ public:
#endif
protected:
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
// common part of all ctors
void Init();

2
src/common/fontcmn.cpp
View File

@@ -144,7 +144,7 @@ wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
#endif
}
void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info)
{
#ifdef wxNO_NATIVE_FONTINFO
SetPointSize(info.pointSize);

2
src/gtk/font.cpp
View File

@@ -856,7 +856,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
M_FONTDATA->SetEncoding(encoding);
}
void wxFont::SetNativeFontInfo( const wxNativeFontInfo& info )
void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
{
Unshare();

2
src/gtk1/font.cpp
View File

@@ -856,7 +856,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
M_FONTDATA->SetEncoding(encoding);
}
void wxFont::SetNativeFontInfo( const wxNativeFontInfo& info )
void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
{
Unshare();

2
src/motif/font.cpp
View File

@@ -414,7 +414,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
RealizeResource();
}
void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
{
Unshare();

2
src/msw/font.cpp
View File

@@ -839,7 +839,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
RealizeResource();
}
void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
{
Unshare();

2
src/os2/font.cpp
View File

@@ -1073,7 +1073,7 @@ void wxFont::SetEncoding(
RealizeResource();
} // end of wxFont::SetEncoding
void wxFont::SetNativeFontInfo(
void wxFont::DoSetNativeFontInfo(
const wxNativeFontInfo& rInfo
)
{

8
src/x11/font.cpp
View File

@@ -563,8 +563,8 @@ bool wxFont::Create(int pointSize,
return TRUE;
}
#if wxUSE_UNICODE
#else
#if !wxUSE_UNICODE
bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
{
if( !fontname )
@@ -667,7 +667,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
}
return TRUE;
}
#endif
#endif // !wxUSE_UNICODE
wxFont::~wxFont()
{
@@ -839,7 +839,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
M_FONTDATA->SetEncoding(encoding);
}
void wxFont::SetNativeFontInfo( const wxNativeFontInfo& info )
void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
{
Unshare();