#include "wx/gtk/private.h"
#include "wx/apptrait.h"
+#include "wx/fontmap.h"
#if wxUSE_LIBHILDON
#include <hildon-widgets/hildon-program.h>
return true;
}
-GdkVisual *wxApp::GetGdkVisual()
-{
- GdkVisual *visual = NULL;
-
- XVisualInfo *xvi = (XVisualInfo *)GetXVisualInfo();
- if ( xvi )
- visual = gdkx_visual_get( xvi->visualid );
- else
- visual = gdk_drawable_get_visual( wxGetRootWindow()->window );
-
- wxASSERT( visual );
-
- return visual;
-}
-
// use unusual names for the parameters to avoid conflict with wxApp::arg[cv]
bool wxApp::Initialize(int& argc_, wxChar **argv_)
{
// (2) if a non default locale is set, assume that the user wants his
// filenames in this locale too
encName = wxLocale::GetSystemEncodingName().Upper();
+
+ // But don't consider ASCII in this case.
+ if ( !encName.empty() )
+ {
+#if wxUSE_FONTMAP
+ wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encName);
+ if ( enc == wxFONTENCODING_DEFAULT )
+#else // !wxUSE_FONTMAP
+ if ( encName == wxT("US-ASCII") )
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
+ {
+ // This means US-ASCII when returned from GetEncodingFromName().
+ encName.clear();
+ }
+ }
+
// (3) finally use UTF-8 by default
- if (encName.empty() || encName == wxT("US-ASCII"))
+ if ( encName.empty() )
encName = wxT("UTF-8");
wxSetEnv(wxT("G_FILENAME_ENCODING"), encName);
}
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// Maemo-specific method: get the main program object
HildonProgram *wxApp::GetHildonProgram()
-{
- return hildon_program_get_instance();
+{
+ return hildon_program_get_instance();
}
-
+
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2