removing path corrections for wxMac, we now want a correct platform string for unzOpen

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 1aa1b5612022cd265fe42206d583e760f4246e12..02bc2ceef070e1c048f60432f6620ffc06dcc247 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -61,6 +61,7 @@
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"

+#include "wx/mac/uma.h"

 #endif
 IMPLEMENT_CLASS(wxColourDatabase, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
 #endif
 IMPLEMENT_CLASS(wxColourDatabase, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)


@@ -192,11 +193,11 @@ wxColourDatabase::wxColourDatabase (int type) : wxList (type)
 wxColourDatabase::~wxColourDatabase ()
 {
   // Cleanup Colour allocated in Initialize()
 wxColourDatabase::~wxColourDatabase ()
 {
   // Cleanup Colour allocated in Initialize()

-  wxNode *node = First ();
+  wxNode *node = GetFirst ();

   while (node)
     {
   while (node)
     {

-      wxColour *col = (wxColour *) node->Data ();
-      wxNode *next = node->Next ();
+      wxColour *col = (wxColour *) node->GetData ();
+      wxNode *next = node->GetNext ();

       delete col;
       node = next;
     }
       delete col;
       node = next;
     }


@@ -329,16 +330,16 @@ 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();
+    wxNode *node = GetFirst();

     while ( node )
     {
         const wxChar *key = node->GetKeyString();
         if ( colName == key || colName2 == key )
         {
     while ( node )
     {
         const wxChar *key = node->GetKeyString();
         if ( colName == key || colName2 == key )
         {

-            return (wxColour *)node->Data();
+            return (wxColour *)node->GetData();

         }
 
         }
 

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

     }
 
 #ifdef __WXMSW__
     }
 
 #ifdef __WXMSW__


@@ -363,7 +364,8 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #ifdef __WXGTK__
   wxColour *col = new wxColour( colour );
 
 #ifdef __WXGTK__
   wxColour *col = new wxColour( colour );
 

-  if (!(col->Ok())) {
+  if (!(col->Ok()))
+  {

       delete col;
       return (wxColour *) NULL;
   }
       delete col;
       return (wxColour *) NULL;
   }


@@ -381,7 +383,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     Display* display = (Display*) wxGetDisplay();
 #endif
     /* MATTHEW: [4] Use wxGetMainColormap */
     Display* display = (Display*) wxGetDisplay();
 #endif
     /* MATTHEW: [4] Use wxGetMainColormap */

-    if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
+    if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour.ToAscii() ,&xcolour))

       return NULL;
 
 #if wxUSE_NANOX
       return NULL;
 
 #if wxUSE_NANOX


@@ -393,7 +395,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     unsigned char g = (unsigned char)(xcolour.green >> 8);
     unsigned char b = (unsigned char)(xcolour.blue >> 8);
 #endif
     unsigned char g = (unsigned char)(xcolour.green >> 8);
     unsigned char b = (unsigned char)(xcolour.blue >> 8);
 #endif

-    
+

     wxColour *col = new wxColour(r, g, b);
     Append(colour, col);
 
     wxColour *col = new wxColour(r, g, b);
     Append(colour, col);
 


@@ -409,9 +411,9 @@ wxString wxColourDatabase::FindName (const wxColour& colour) const
     unsigned char green = colour.Green ();
     unsigned char blue = colour.Blue ();
 
     unsigned char green = colour.Green ();
     unsigned char blue = colour.Blue ();
 

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

     {
     {

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

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


@@ -455,7 +457,6 @@ void wxInitializeStockObjects ()
 #if defined(__WXMAC__)
     int sizeFont = 12;
 
 #if defined(__WXMAC__)
     int sizeFont = 12;
 

-    FontFamilyID fontId ;

     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;


@@ -476,8 +477,8 @@ void wxInitializeStockObjects ()
   // Basic OS/2 has a fairly limited number of fonts and these are as good
   // as I can do to get something that looks halfway "wx" normal
   */
   // Basic OS/2 has a fairly limited number of fonts and these are as good
   // as I can do to get something that looks halfway "wx" normal
   */

-  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); /* System VIO */
-  wxSMALL_FONT = new wxFont (sizeFont - 4, wxMODERN, wxNORMAL, wxNORMAL); /* System VIO */
+  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
+  wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */

   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
   wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
 #elif defined(__WXMAC__)
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
   wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
 #elif defined(__WXMAC__)


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

-  wxNode *node = First ();
+  wxNode *node = GetFirst ();

   while (node)
     {
   while (node)
     {

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

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


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

-  wxNode *node = First ();
+  wxNode *node = GetFirst ();

   while (node)
     {
   while (node)
     {

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

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


@@ -624,9 +625,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 (wxNode * 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 &&


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

-  wxNode *node = First ();
+  wxNode *node = GetFirst ();

   while (node)
     {
   while (node)
     {

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

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


@@ -674,9 +675,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 (wxNode * 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 &&


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

-    wxNode *node = First ();
+    wxNode *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 ();
+        wxNode *next = node->GetNext ();

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


@@ -746,9 +747,9 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
 {
     wxFont *font = (wxFont *)NULL;
     wxNode *node;
 {
     wxFont *font = (wxFont *)NULL;
     wxNode *node;

-    for ( node = First(); node; node = node->Next() )
+    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 &&


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

-    wxNode *node = First ();
+    wxNode *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 ();

     }
 }
 
     }
 }