VZ: I have reformatted it to correspond to our style conventions (tab stop =

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index c6978df34bb1b0cb4e9acf1f8a5a194610142134..7238bc9d0ace8ecbc410adc12b2e6172b102f61c 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -20,7 +20,6 @@
 #pragma hdrstop
 #endif
 
-#include "wx/log.h"
 
 #include "wx/gdicmn.h"
 #include "wx/brush.h"
@@ -31,6 +30,7 @@
 #include "wx/font.h"
 #include "wx/palette.h"
 
+#include "wx/log.h"
 #include <string.h>
 
 #ifdef __WXMSW__
@@ -271,7 +271,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     
     if (!(col->Ok())) {
       delete col;
-      return NULL;
+      return (wxColour *) NULL;
     }
     Append( colour, col );
     return col;
@@ -439,31 +439,34 @@ wxBitmapList::wxBitmapList ()
 
 wxBitmapList::~wxBitmapList ()
 {
-  wxLogDebug("~wxBitmapList: count = %d", Number());
+#ifdef __WXMSW__
 
   wxNode *node = First ();
   while (node)
     {
       wxBitmap *bitmap = (wxBitmap *) node->Data ();
       wxNode *next = node->Next ();
-      delete bitmap;
-//      bitmap->FreeResource(TRUE);
+      if (bitmap->GetVisible())
+        delete bitmap;
       node = next;
     }
+#endif
 }
 
 // Pen and Brush lists
 wxPenList::~wxPenList ()
 {
+#ifdef __WXMSW__
   wxNode *node = First ();
   while (node)
     {
       wxPen *pen = (wxPen *) node->Data ();
       wxNode *next = node->Next ();
-      delete pen;
-//      pen->FreeResource(TRUE);
+      if (pen->GetVisible())
+        delete pen;
       node = next;
     }
+#endif
 }
 
 void wxPenList::AddPen (wxPen * pen)
@@ -505,19 +508,22 @@ wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style)
   if (the_colour)
     return FindOrCreatePen (*the_colour, width, style);
   else
-    return NULL;
+    return (wxPen *) NULL;
 }
 
 wxBrushList::~wxBrushList ()
 {
+#ifdef __WXMSW__
   wxNode *node = First ();
   while (node)
     {
       wxBrush *brush = (wxBrush *) node->Data ();
       wxNode *next = node->Next ();
-      delete brush;
+      if (brush->GetVisible())
+        delete brush;
       node = next;
     }
+#endif
 }
 
 void wxBrushList::AddBrush (wxBrush * brush)
@@ -552,7 +558,7 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style)
   if (the_colour)
     return FindOrCreateBrush (*the_colour, style);
   else
-    return NULL;
+    return (wxBrush *) NULL;
 }
 
 void wxBrushList::RemoveBrush (wxBrush * brush)
@@ -562,26 +568,19 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
 
 wxFontList::~wxFontList ()
 {
-#ifdef __WXMSW__
   wxNode *node = First ();
   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 ();
-      delete font;
+         if (font->GetVisible())
+               delete font;
       node = next;
-*/
-         // New for 2.0: don't delete the font (it may be a member
-         // of a wxDC, for example)
-      wxFont *font = (wxFont *) node->Data ();
-      wxNode *next = node->Next ();
-
-         // Force the font to be deleted
-      font->FreeResource(TRUE);
-      node = next;
-    }
-#endif
+}
 }
 
 void wxFontList::AddFont (wxFont * font)