first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,6 +28,8 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_FONTMAP
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/app.h"
|
||||
#include "wx/log.h"
|
||||
@@ -55,6 +57,7 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// the config paths we use
|
||||
#if wxUSE_CONFIG
|
||||
static const wxChar* FONTMAPPER_ROOT_PATH = wxT("/wxWindows/FontMapper");
|
||||
static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
|
||||
static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
|
||||
@@ -64,6 +67,7 @@ static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
|
||||
static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
|
||||
static const wxChar* FONTMAPPER_FONT_DONT_ASK = wxT("none");
|
||||
#endif // wxUSE_GUI
|
||||
#endif // wxUSE_CONFIG
|
||||
|
||||
// encodings supported by GetEncodingDescription
|
||||
static wxFontEncoding gs_encodings[] =
|
||||
@@ -835,3 +839,5 @@ bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,
|
||||
}
|
||||
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
#endif // wxUSE_FONTMAP
|
||||
|
Reference in New Issue
Block a user