Various fixes.

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 69cc0cac80b0f57abe5508fcc94ba7c5ed5d9752..57c72604d3b9627c6859b5fdc4285a5adad17d33 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -256,7 +256,11 @@ void wxColourDatabase::Initialize ()
 
 wxColour *wxColourDatabase::FindColour(const wxString& colour)
 {
-  wxNode *node = Find((char *) (const char *)colour);
+  // VZ: make the comparaison case insensitive
+  wxString str = colour;
+  str.MakeUpper();
+
+  wxNode *node = Find(str);
   if (node)
     return (wxColour *)node->Data();
     
@@ -290,6 +294,11 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #ifdef __WXMOTIF__
     Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
 #endif
+#ifdef __XVIEW__
+    Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0);
+    Xv_opaque root_window = xv_get(screen, XV_ROOT);
+    Display *display = (Display *)xv_get(root_window, XV_DISPLAY);
+#endif
 
     /* MATTHEW: [4] Use wxGetMainColormap */
     if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
@@ -319,7 +328,7 @@ wxString wxColourDatabase::FindName (const wxColour& colour) const
       
       if (col->Red () == red && col->Green () == green && col->Blue () == blue)
        {
-         char *found = node->key.string;
+         const char *found = node->GetKeyString();
          if (found)
            return wxString(found);
        }
@@ -503,15 +512,6 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
   return pen;
 }
 
-wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style)
-{
-  wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
-  if (the_colour)
-    return FindOrCreatePen (*the_colour, width, style);
-  else
-    return (wxPen *) NULL;
-}
-
 wxBrushList::~wxBrushList ()
 {
 #ifdef __WXMSW__
@@ -553,15 +553,6 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
   return brush;
 }
 
-wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style)
-{
-  wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
-  if (the_colour)
-    return FindOrCreateBrush (*the_colour, style);
-  else
-    return (wxBrush *) NULL;
-}
-
 void wxBrushList::RemoveBrush (wxBrush * brush)
 {
   DeleteObject (brush);
@@ -630,12 +621,6 @@ wxSize wxGetDisplaySize()
     return wxSize(x, y);
 }
 
-wxResourceCache::wxResourceCache () : wxList() {
-}
-
-wxResourceCache::wxResourceCache (const unsigned int the_key_type) : wxList(the_key_type) {
-}
-
 wxResourceCache::~wxResourceCache () {
   wxNode *node = First ();
   while (node) {