projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Source cleaning for new features.
[wxWidgets.git]
/
src
/
common
/
fontmap.cpp
diff --git
a/src/common/fontmap.cpp
b/src/common/fontmap.cpp
index 18114477ff855487927f5b91b8f5eb01fe53ad1d..b0ba68445bcb68d854b6c121e953ba9e94051e84 100644
(file)
--- a/
src/common/fontmap.cpp
+++ b/
src/common/fontmap.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: common/fontmap.cpp
+// Name:
src/
common/fontmap.cpp
// Purpose: wxFontMapper class
// Author: Vadim Zeitlin
// Modified by:
// Purpose: wxFontMapper class
// Author: Vadim Zeitlin
// Modified by:
@@
-26,10
+26,13
@@
#if wxUSE_FONTMAP
#if wxUSE_FONTMAP
+#include "wx/fontmap.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/log.h"
#include "wx/intl.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/msgdlg.h"
#endif // PCH
#if wxUSE_CONFIG
#endif // PCH
#if wxUSE_CONFIG
@@
-41,10
+44,8
@@
#include "wx/msw/winundef.h"
#endif
#include "wx/msw/winundef.h"
#endif
-#include "wx/fontmap.h"
#include "wx/fmappriv.h"
#include "wx/fontutil.h"
#include "wx/fmappriv.h"
#include "wx/fontutil.h"
-#include "wx/msgdlg.h"
#include "wx/fontdlg.h"
#include "wx/choicdlg.h"
#include "wx/encinfo.h"
#include "wx/fontdlg.h"
#include "wx/choicdlg.h"
#include "wx/encinfo.h"
@@
-491,13
+492,13
@@
bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
const wxString& facename,
bool interactive)
{
const wxString& facename,
bool interactive)
{
+ wxCHECK_MSG( encodingAlt, false,
+ _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
+
wxNativeEncodingInfo info;
if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
return false;
wxNativeEncodingInfo info;
if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
return false;
- wxCHECK_MSG( encodingAlt, false,
- _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
-
*encodingAlt = info.encoding;
return true;
*encodingAlt = info.encoding;
return true;