First pass at adding MicroWindows support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -93,8 +93,10 @@ private:
|
||||
// private functions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifndef __WXMICROWIN__
|
||||
int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
|
||||
DWORD dwStyle, LONG lParam);
|
||||
#endif
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
@@ -147,6 +149,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
|
||||
|
||||
void wxFontEnumeratorHelper::DoEnumerate()
|
||||
{
|
||||
#ifndef __WXMICROWIN__
|
||||
HDC hDC = ::GetDC(NULL);
|
||||
|
||||
#ifdef __WIN32__
|
||||
@@ -167,6 +170,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
|
||||
#endif // Win32/16
|
||||
|
||||
::ReleaseDC(NULL, hDC);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
|
||||
@@ -246,6 +250,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
|
||||
// Windows callbacks
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifndef __WXMICROWIN__
|
||||
int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
|
||||
DWORD dwStyle, LONG lParam)
|
||||
{
|
||||
@@ -260,5 +265,6 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
|
||||
|
||||
return fontEnum->OnFont(lplf, lptm);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // wxUSE_FONTMAP
|
||||
|
Reference in New Issue
Block a user