style creation

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 09222b21d40f89b02efd4b7830d2f3f9a57123fd..445f18f4c541a290e7b17e32d31ddac6adc54af4 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -37,6 +37,7 @@
 #include "wx/dc.h"
 #include "wx/utils.h"
 #include "wx/settings.h"
 #include "wx/dc.h"
 #include "wx/utils.h"
 #include "wx/settings.h"

+#include "wx/hashmap.h"

 
 #include "wx/log.h"
 #include <string.h>
 
 #include "wx/log.h"
 #include <string.h>


@@ -63,12 +64,12 @@
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 #endif
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 #endif

-IMPLEMENT_CLASS(wxColourDatabase, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
+//IMPLEMENT_CLASS(wxColourDatabase, wxList)
+//IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
+//IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
+//IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
+//IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
+//IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)

 
 IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 


@@ -186,21 +187,22 @@ bool wxRect::Intersects(const wxRect& rect) const
     return r.width != 0;
 }
 
     return r.width != 0;
 }
 

-wxColourDatabase::wxColourDatabase (int type) : wxList (type)
+WX_DECLARE_STRING_HASH_MAP( wxColour*, wxStringToColourHashMap );
+
+wxColourDatabase::wxColourDatabase ()

 {
 {

+    m_map = new wxStringToColourHashMap;

 }
 
 wxColourDatabase::~wxColourDatabase ()
 {
 }
 
 wxColourDatabase::~wxColourDatabase ()
 {

-  // Cleanup Colour allocated in Initialize()
-  wxNode *node = First ();
-  while (node)
-    {
-      wxColour *col = (wxColour *) node->Data ();
-      wxNode *next = node->Next ();
-      delete col;
-      node = next;
-    }
+    typedef wxStringToColourHashMap::iterator iterator;
+
+    for( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )
+        delete it->second;
+
+    delete m_map;
+    m_map = NULL;

 #ifdef __WXPM__
     delete [] m_palTable;
 #endif
 #ifdef __WXPM__
     delete [] m_palTable;
 #endif


@@ -298,7 +300,7 @@ void wxColourDatabase::Initialize ()
     for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
     {
         const wxColourDesc& cc = wxColourTable[n];
     for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
     {
         const wxColourDesc& cc = wxColourTable[n];

-        Append(cc.name, new wxColour(cc.r,cc.g,cc.b));
+        (*m_map)[cc.name] =  new wxColour(cc.r,cc.g,cc.b);

     }
 #ifdef __WXPM__
     m_palTable = new long[n];
     }
 #ifdef __WXPM__
     m_palTable = new long[n];


@@ -321,6 +323,16 @@ void wxColourDatabase::Initialize ()
  */
 
 wxColour *wxColourDatabase::FindColour(const wxString& colour)
  */
 
 wxColour *wxColourDatabase::FindColour(const wxString& colour)

+{
+    return FindColour(colour, true);
+}
+
+wxColour *wxColourDatabase::FindColourNoAdd(const wxString& colour) const
+{
+    return ((wxColourDatabase*)this)->FindColour(colour, false);
+}
+
+wxColour *wxColourDatabase::FindColour(const wxString& colour, bool add)

 {
     // VZ: make the comparaison case insensitive and also match both grey and
     //     gray
 {
     // VZ: make the comparaison case insensitive and also match both grey and
     //     gray


@@ -330,17 +342,14 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
         colName2.clear();
 
     if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
         colName2.clear();
 

-    wxNode *node = First();
-    while ( node )
-    {
-        const wxChar *key = node->GetKeyString();
-        if ( colName == key || colName2 == key )
-        {
-            return (wxColour *)node->Data();
-        }
+    wxStringToColourHashMap::iterator it = m_map->find(colName);
+    if ( it == m_map->end() )
+        it = m_map->find(colName2);
+    if ( it != m_map->end() )
+        return it->second;

 
 

-        node = node->Next();
-    }
+    if ( !add )
+        return NULL;

 
 #ifdef __WXMSW__
   return NULL;
 
 #ifdef __WXMSW__
   return NULL;


@@ -357,6 +366,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #ifdef __WXMAC__
   return NULL;
 #endif
 #ifdef __WXMAC__
   return NULL;
 #endif

+#ifdef __WXCOCOA__
+  return NULL;
+#endif

 #ifdef __WXSTUBS__
   return NULL;
 #endif
 #ifdef __WXSTUBS__
   return NULL;
 #endif


@@ -369,7 +381,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
       delete col;
       return (wxColour *) NULL;
   }
       delete col;
       return (wxColour *) NULL;
   }

-  Append( colour, col );
+  (*m_map)[colour] = col;

   return col;
 #endif
 
   return col;
 #endif
 


@@ -397,7 +409,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #endif
 
     wxColour *col = new wxColour(r, g, b);
 #endif
 
     wxColour *col = new wxColour(r, g, b);

-    Append(colour, col);
+    (*m_map)[colour] = col;

 
     return col;
 #endif // __X__
 
     return col;
 #endif // __X__


@@ -405,37 +417,32 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 
 wxString wxColourDatabase::FindName (const wxColour& colour) const
 {
 
 wxString wxColourDatabase::FindName (const wxColour& colour) const
 {

-    wxString name;
-

     unsigned char red = colour.Red ();
     unsigned char green = colour.Green ();
     unsigned char blue = colour.Blue ();
 
     unsigned char red = colour.Red ();
     unsigned char green = colour.Green ();
     unsigned char blue = colour.Blue ();
 

-    for (wxNode * node = First (); node; node = node->Next ())
+    typedef wxStringToColourHashMap::iterator iterator;
+
+    for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )

     {
     {

-        wxColour *col = (wxColour *) node->Data ();
+        wxColour *col = it->second;

 
         if (col->Red () == red && col->Green () == green && col->Blue () == blue)
 
         if (col->Red () == red && col->Green () == green && col->Blue () == blue)

-        {
-            const wxChar *found = node->GetKeyString();
-            if ( found )
-            {
-                name = found;
-
-                break;
-            }
-        }
+            return it->first;

     }
 
     }
 

-    return name;
+    return wxEmptyString;

 }
 
 void wxInitializeStockLists()
 {
 }
 
 void wxInitializeStockLists()
 {

-  wxTheBrushList = new wxBrushList;
-  wxThePenList = new wxPenList;
-  wxTheFontList = new wxFontList;
-  wxTheBitmapList = new wxBitmapList;
+    wxTheColourDatabase = new wxColourDatabase;
+    wxTheColourDatabase->Initialize();
+
+    wxTheBrushList = new wxBrushList;
+    wxThePenList = new wxPenList;
+    wxTheFontList = new wxFontList;
+    wxTheBitmapList = new wxBitmapList;

 }
 
 void wxInitializeStockObjects ()
 }
 
 void wxInitializeStockObjects ()


@@ -463,8 +470,7 @@ void wxInitializeStockObjects ()
 
        GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
        sizeFont = fontSize ;
 
        GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
        sizeFont = fontSize ;

-    p2cstrcpy( (char*) fontName , fontName ) ;
-    wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
+    wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );

 #elif defined(__WXPM__)
   static const int sizeFont = 12;
 #else
 #elif defined(__WXPM__)
   static const int sizeFont = 12;
 #else


@@ -485,8 +491,7 @@ void wxInitializeStockObjects ()
     wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
     wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
     wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;

-    p2cstrcpy( (char*) fontName , fontName ) ;
-    wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
+    wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );

 #else
   wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
 #else
   wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);


@@ -588,11 +593,11 @@ wxBitmapList::wxBitmapList()
 
 wxBitmapList::~wxBitmapList ()
 {
 
 wxBitmapList::~wxBitmapList ()
 {

-  wxNode *node = First ();
+  wxList::compatibility_iterator node = GetFirst ();

   while (node)
     {
   while (node)
     {

-      wxBitmap *bitmap = (wxBitmap *) node->Data ();
-      wxNode *next = node->Next ();
+      wxBitmap *bitmap = (wxBitmap *) node->GetData ();
+      wxList::compatibility_iterator next = node->GetNext ();

       if (bitmap->GetVisible())
         delete bitmap;
       node = next;
       if (bitmap->GetVisible())
         delete bitmap;
       node = next;


@@ -602,11 +607,11 @@ wxBitmapList::~wxBitmapList ()
 // Pen and Brush lists
 wxPenList::~wxPenList ()
 {
 // Pen and Brush lists
 wxPenList::~wxPenList ()
 {

-  wxNode *node = First ();
+  wxList::compatibility_iterator node = GetFirst ();

   while (node)
     {
   while (node)
     {

-      wxPen *pen = (wxPen *) node->Data ();
-      wxNode *next = node->Next ();
+      wxPen *pen = (wxPen *) node->GetData ();
+      wxList::compatibility_iterator next = node->GetNext ();

       if (pen->GetVisible())
         delete pen;
       node = next;
       if (pen->GetVisible())
         delete pen;
       node = next;


@@ -625,9 +630,9 @@ void wxPenList::RemovePen (wxPen * pen)
 
 wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 {
 
 wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 {

-    for (wxNode * node = First (); node; node = node->Next ())
+    for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ())

     {
     {

-        wxPen *each_pen = (wxPen *) node->Data ();
+        wxPen *each_pen = (wxPen *) node->GetData ();

         if (each_pen &&
                 each_pen->GetVisible() &&
                 each_pen->GetWidth () == width &&
         if (each_pen &&
                 each_pen->GetVisible() &&
                 each_pen->GetWidth () == width &&


@@ -657,11 +662,11 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 
 wxBrushList::~wxBrushList ()
 {
 
 wxBrushList::~wxBrushList ()
 {

-  wxNode *node = First ();
+  wxList::compatibility_iterator node = GetFirst ();

   while (node)
     {
   while (node)
     {

-      wxBrush *brush = (wxBrush *) node->Data ();
-      wxNode *next = node->Next ();
+      wxBrush *brush = (wxBrush *) node->GetData ();
+      wxList::compatibility_iterator next = node->GetNext ();

       if (brush && brush->GetVisible())
         delete brush;
       node = next;
       if (brush && brush->GetVisible())
         delete brush;
       node = next;


@@ -675,9 +680,9 @@ void wxBrushList::AddBrush (wxBrush * brush)
 
 wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
 {
 
 wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
 {

-    for (wxNode * node = First (); node; node = node->Next ())
+    for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ())

     {
     {

-        wxBrush *each_brush = (wxBrush *) node->Data ();
+        wxBrush *each_brush = (wxBrush *) node->GetData ();

         if (each_brush &&
                 each_brush->GetVisible() &&
                 each_brush->GetStyle () == style &&
         if (each_brush &&
                 each_brush->GetVisible() &&
                 each_brush->GetStyle () == style &&


@@ -712,15 +717,15 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
 
 wxFontList::~wxFontList ()
 {
 
 wxFontList::~wxFontList ()
 {

-    wxNode *node = First ();
+    wxList::compatibility_iterator node = GetFirst ();

     while (node)
     {
         // Only delete objects that are 'visible', i.e.
         // that have been created using FindOrCreate...,
         // where the pointers are expected to be shared
         // (and therefore not deleted by any one part of an app).
     while (node)
     {
         // Only delete objects that are 'visible', i.e.
         // that have been created using FindOrCreate...,
         // where the pointers are expected to be shared
         // (and therefore not deleted by any one part of an app).

-        wxFont *font = (wxFont *) node->Data ();
-        wxNode *next = node->Next ();
+        wxFont *font = (wxFont *) node->GetData ();
+        wxList::compatibility_iterator next = node->GetNext ();

         if (font->GetVisible())
             delete font;
         node = next;
         if (font->GetVisible())
             delete font;
         node = next;


@@ -746,10 +751,10 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
                                      wxFontEncoding encoding)
 {
     wxFont *font = (wxFont *)NULL;
                                      wxFontEncoding encoding)
 {
     wxFont *font = (wxFont *)NULL;

-    wxNode *node;
-    for ( node = First(); node; node = node->Next() )
+    wxList::compatibility_iterator node;
+    for ( node = GetFirst(); node; node = node->GetNext() )

     {
     {

-        font = (wxFont *)node->Data();
+        font = (wxFont *)node->GetData();

         if ( font->GetVisible() &&
              font->Ok() &&
              font->GetPointSize () == pointSize &&
         if ( font->GetVisible() &&
              font->Ok() &&
              font->GetPointSize () == pointSize &&


@@ -844,12 +849,12 @@ wxSize wxGetDisplaySizeMM()
 
 wxResourceCache::~wxResourceCache ()
 {
 
 wxResourceCache::~wxResourceCache ()
 {

-    wxNode *node = First ();
+    wxList::compatibility_iterator node = GetFirst ();

     while (node) {
     while (node) {

-        wxObject *item = (wxObject *)node->Data();
+        wxObject *item = (wxObject *)node->GetData();

         delete item;
 
         delete item;
 

-        node = node->Next ();
+        node = node->GetNext ();

     }
 }
 
     }
 }