Native spline drawing.

[wxWidgets.git] / src / motif / settings.cpp

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index 39aaf9ba2c3734f07a2ad09d82e7170ba7740b3d..bda934ee21ecc661e1c04d89cfd7f19b9bd538d7 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -161,11 +161,17 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
+    int pointSize = 12;
+
+    if (   wxFont::GetDefaultEncoding() == wxFONTENCODING_SHIFT_JIS
+        || wxFont::GetDefaultEncoding() == wxFONTENCODING_EUC_JP)
+        pointSize = 15;
+
     switch (index)
     {
         case wxSYS_SYSTEM_FIXED_FONT:
         {
-            return wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, false);
+            return wxFont(pointSize, wxMODERN, wxNORMAL, wxNORMAL, false);
             break;
         }
         case wxSYS_DEVICE_DEFAULT_FONT:
@@ -173,7 +179,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_DEFAULT_GUI_FONT:
         default:
         {
-            return wxFont(12, wxSWISS, wxNORMAL, wxNORMAL, false);
+            return wxFont(pointSize, wxSWISS, wxNORMAL, wxNORMAL, false);
             break;
         }
     }
@@ -182,7 +188,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 }
 
 // Get a system metric, e.g. scrollbar size
-int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
 {
     int return_value = 0;