projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let wxMSW report wxDataViewCustomRenderer::LeftClick() report the click position...
[wxWidgets.git]
/
src
/
msw
/
fontenum.cpp
diff --git
a/src/msw/fontenum.cpp
b/src/msw/fontenum.cpp
index ed22b7406dd32a56b4105fba89c5b4056c9d8fa2..27c2832868b1e8f8fe44d325ce67b0a88133b56d 100644
(file)
--- a/
src/msw/fontenum.cpp
+++ b/
src/msw/fontenum.cpp
@@
-1,12
+1,12
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/fontenum.cpp
+// Name:
src/
msw/fontenum.cpp
// Purpose: wxFontEnumerator class for Windows
// Author: Julian Smart
// Modified by: Vadim Zeitlin to add support for font encodings
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxFontEnumerator class for Windows
// Author: Julian Smart
// Modified by: Vadim Zeitlin to add support for font encodings
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "fontenum.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"
@@
-28,11
+24,13
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_FONT
MAP
+#if wxUSE_FONT
ENUM
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
+ #include "wx/gdicmn.h"
#include "wx/font.h"
#include "wx/encinfo.h"
#include "wx/font.h"
#include "wx/encinfo.h"
+ #include "wx/dynarray.h"
#endif
#include "wx/msw/private.h"
#endif
#include "wx/msw/private.h"
@@
-80,10
+78,10
@@
private:
// if not empty, enum only the fonts in this family
wxString m_family;
// if not empty, enum only the fonts in this family
wxString m_family;
- // if
TRUE
, enum only fixed fonts
+ // if
true
, enum only fixed fonts
bool m_fixedOnly;
bool m_fixedOnly;
- // if
TRUE
, we enumerate the encodings, not fonts
+ // if
true
, we enumerate the encodings, not fonts
bool m_enumEncodings;
// the list of charsets we already found while enumerating charsets
bool m_enumEncodings;
// the list of charsets we already found while enumerating charsets
@@
-92,7
+90,7
@@
private:
// the list of facenames we already found while enumerating facenames
wxArrayString m_facenames;
// the list of facenames we already found while enumerating facenames
wxArrayString m_facenames;
- DECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper)
+ wxDECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper);
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-101,7
+99,7
@@
private:
#ifndef __WXMICROWIN__
int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
#ifndef __WXMICROWIN__
int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
- DWORD dwStyle, L
ONG
lParam);
+ DWORD dwStyle, L
PARAM
lParam);
#endif
// ============================================================================
#endif
// ============================================================================
@@
-116,13
+114,13
@@
wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
{
m_fontEnum = fontEnum;
m_charset = DEFAULT_CHARSET;
{
m_fontEnum = fontEnum;
m_charset = DEFAULT_CHARSET;
- m_fixedOnly =
FALSE
;
- m_enumEncodings =
FALSE
;
+ m_fixedOnly =
false
;
+ m_enumEncodings =
false
;
}
void wxFontEnumeratorHelper::SetFamily(const wxString& family)
{
}
void wxFontEnumeratorHelper::SetFamily(const wxString& family)
{
- m_enumEncodings =
TRUE
;
+ m_enumEncodings =
true
;
m_family = family;
}
m_family = family;
}
@@
-138,7
+136,7
@@
bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
#endif // wxUSE_FONTMAP
{
// no such encodings at all
#endif // wxUSE_FONTMAP
{
// no such encodings at all
- return
FALSE
;
+ return
false
;
}
}
}
}
@@
-146,7
+144,7
@@
bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
m_facename = info.facename;
}
m_facename = info.facename;
}
- return
TRUE
;
+ return
true
;
}
#if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS
}
#if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS
@@
-161,12
+159,14
@@
void wxFontEnumeratorHelper::DoEnumerate()
HDC hDC = ::GetDC(NULL);
#ifdef __WXWINCE__
HDC hDC = ::GetDC(NULL);
#ifdef __WXWINCE__
- ::EnumFontFamilies(hDC, m_facename, (wxFONTENUMPROC)wxFontEnumeratorProc,
- (LPARAM)this) ;
+ ::EnumFontFamilies(hDC,
+ m_facename.empty() ? NULL : m_facename.wx_str(),
+ (wxFONTENUMPROC)wxFontEnumeratorProc,
+ (LPARAM)this) ;
#else // __WIN32__
LOGFONT lf;
#else // __WIN32__
LOGFONT lf;
- lf.lfCharSet = m_charset;
- wxStr
ncpy(lf.lfFaceName, m_facename
, WXSIZEOF(lf.lfFaceName));
+ lf.lfCharSet =
(BYTE)
m_charset;
+ wxStr
lcpy(lf.lfFaceName, m_facename.c_str()
, WXSIZEOF(lf.lfFaceName));
lf.lfPitchAndFamily = 0;
::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
(LPARAM)this, 0 /* reserved */) ;
lf.lfPitchAndFamily = 0;
::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
(LPARAM)this, 0 /* reserved */) ;
@@
-194,7
+194,7
@@
bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
else
{
// continue enumeration
else
{
// continue enumeration
- return
TRUE
;
+ return
true
;
}
}
}
}
@@
-205,7
+205,7
@@
bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
{
// not a fixed pitch font
if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
{
// not a fixed pitch font
- return
TRUE
;
+ return
true
;
}
}
}
}
@@
-214,7
+214,7
@@
bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
// check that we have the right encoding
if ( lf->lfCharSet != m_charset )
{
// check that we have the right encoding
if ( lf->lfCharSet != m_charset )
{
- return
TRUE
;
+ return
true
;
}
}
else // enumerating fonts in all charsets
}
}
else // enumerating fonts in all charsets
@@
-225,7
+225,7
@@
bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
if ( m_facenames.Index(lf->lfFaceName) != wxNOT_FOUND )
{
// continue enumeration
if ( m_facenames.Index(lf->lfFaceName) != wxNOT_FOUND )
{
// continue enumeration
- return
TRUE
;
+ return
true
;
}
wxConstCast(this, wxFontEnumeratorHelper)->
}
wxConstCast(this, wxFontEnumeratorHelper)->
@@
-251,7
+251,7
@@
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
}
// else: no such fonts, unknown encoding
}
// else: no such fonts, unknown encoding
- return
TRUE
;
+ return
true
;
}
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
}
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
@@
-260,7
+260,7
@@
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
fe.SetFamily(family);
fe.DoEnumerate();
fe.SetFamily(family);
fe.DoEnumerate();
- return
TRUE
;
+ return
true
;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-269,7
+269,7
@@
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
#ifndef __WXMICROWIN__
int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
#ifndef __WXMICROWIN__
int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
- DWORD WXUNUSED(dwStyle), L
ONG
lParam)
+ DWORD WXUNUSED(dwStyle), L
PARAM
lParam)
{
// we used to process TrueType fonts only, but there doesn't seem to be any
{
// we used to process TrueType fonts only, but there doesn't seem to be any
@@
-289,4
+289,4
@@
int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
}
#endif
}
#endif
-#endif // wxUSE_FONT
MAP
+#endif // wxUSE_FONT
ENUM