From: Nicolas Boichat <nicolas@boichat.ch>
Date: Thu, 6 May 2004 15:25:23 +0000 (+0000)
Subject: Corrected GTK+ 1.2 font problem.
X-Git-Tag: Release-1.34.3~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=addaab0b6f8ea10128feaa2c34433e7a8eb5faa9;p=thirdparty%2Fbacula.git

Corrected GTK+ 1.2 font problem.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1341 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/wx-console/wxbmainframe.cpp b/bacula/src/wx-console/wxbmainframe.cpp
index beb400f6e..e9b8eea83 100644
--- a/bacula/src/wx-console/wxbmainframe.cpp
+++ b/bacula/src/wx-console/wxbmainframe.cpp
@@ -226,7 +226,14 @@ wxbMainFrame::wxbMainFrame(const wxString& title, const wxPoint& pos, const wxSi
    notebook->AddPage(consolePanel, "Console");
 
    consoleCtrl = new wxTextCtrl(consolePanel,-1,"",wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH);
-   consoleCtrl->SetDefaultStyle(wxTextAttr(*wxBLACK, wxNullColour, wxFont(10, wxMODERN, wxNORMAL, wxNORMAL)));
+   wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL);
+#if defined __WXGTK12__ && !defined __WXGTK20__ // Fix for "chinese" fonts under gtk+ 1.2
+   font.SetDefaultEncoding(wxFONTENCODING_ISO8859_1);
+   consoleCtrl->SetDefaultStyle(wxTextAttr(*wxBLACK, wxNullColour, font));
+   Print("Warning : Unicode is disabled because you are using wxWidgets for GTK+ 1.2.", CS_DEBUG);
+#else
+   consoleCtrl->SetDefaultStyle(wxTextAttr(*wxBLACK, wxNullColour, font));
+#endif
 
    wxFlexGridSizer *consoleSizer = new wxFlexGridSizer(2, 1, 0, 0);
    consoleSizer->AddGrowableCol(0);