From 54dcf145feb39f4eb2e9cd78de2ce469acd3e28c Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 23 Jul 2016 04:48:40 +0000
Subject: Fix Fl_X11_System_Driver::utf8locale() that did not work when no
 locale is set.

Also, minor simplification of Fl_WinAPI_System_Driver::utf8locale().

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11846 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx')

diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
index ef6070e84..f7d37fecb 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
@@ -406,10 +406,7 @@ unsigned Fl_WinAPI_System_Driver::utf8fromwc(char* dst, unsigned dstlen, const w
 
 int Fl_WinAPI_System_Driver::utf8locale()
 {
-  static int ret = 2;
-  if (ret == 2) {
-    ret = GetACP() == CP_UTF8;
-  }
+  static int ret = (GetACP() == CP_UTF8);
   return ret;
 }
 
-- 
cgit v1.2.3