From f41e7a8352247d0a02bbcca6cc8fe154a2117e62 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 6 Dec 2005 22:32:20 +0000 Subject: [PATCH] no toupper for color-database lookups (because it's locale-sensitive) svn: r1544 --- src/wxmac/src/base/wb_gdi.cc | 4 +++- src/wxwindow/src/base/wb_gdi.cxx | 4 +++- src/wxxt/src/GDI-Classes/Colour.cc | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/wxmac/src/base/wb_gdi.cc b/src/wxmac/src/base/wb_gdi.cc index d8a934f822..9f1f7dbde8 100644 --- a/src/wxmac/src/base/wb_gdi.cc +++ b/src/wxmac/src/base/wb_gdi.cc @@ -270,7 +270,9 @@ wxColour *wxColourDatabase::FindColour(const char *colour) char *naya; naya = new char[strlen(colour) + 1]; for (q = 0; colour[q]; q++) { - naya[q] = toupper(colour[q]); + naya[q] = colour[q]; + if ((naya[q] >= 'a') && (naya[q] <= 'z')) + naya[q] -= ('a' - 'A'); } naya[q] = 0; colour = naya; diff --git a/src/wxwindow/src/base/wb_gdi.cxx b/src/wxwindow/src/base/wb_gdi.cxx index e55358213f..b1865ab83f 100644 --- a/src/wxwindow/src/base/wb_gdi.cxx +++ b/src/wxwindow/src/base/wb_gdi.cxx @@ -207,7 +207,9 @@ wxColour *wxColourDatabase::FindColour(const char *colour) wxNode *node; for (i = 0; colour[i] && i < 255; i++) { - uc_colour[i] = toupper(colour[i]); + uc_colour[i] = colour[i]; + if ((uc_colour[i] >= 'a') && (uc_colour[i] <= 'z')) + uc_colour[i] -= ('a' - 'A'); } uc_colour[i] = 0; colour = uc_colour; diff --git a/src/wxxt/src/GDI-Classes/Colour.cc b/src/wxxt/src/GDI-Classes/Colour.cc index dc750c2e48..8e501b9e3d 100644 --- a/src/wxxt/src/GDI-Classes/Colour.cc +++ b/src/wxxt/src/GDI-Classes/Colour.cc @@ -359,7 +359,9 @@ wxColour *wxColourDatabase::FindColour(const char *colour) int i; for (i = 0; colour[i] && i < 255; i++) { - uc_colour[i] = toupper(colour[i]); + uc_colour[i] = colour[i]; + if ((uc_colour[i] >= 'a') && (uc_colour[i] <= 'z')) + uc_colour[i] -= ('a' - 'A'); } uc_colour[i] = 0; colour = uc_colour;