Removed warnings

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 1e98af34efe5e68a68aee41cc42c6b731e81aa94..7238bc9d0ace8ecbc410adc12b2e6172b102f61c 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -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,7 +439,6 @@ wxBitmapList::wxBitmapList ()
 
 wxBitmapList::~wxBitmapList ()
 {
-  wxLogDebug("~wxBitmapList: count = %d", Number());
 #ifdef __WXMSW__
 
   wxNode *node = First ();
@@ -509,7 +508,7 @@ 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 ()
@@ -559,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)
@@ -569,7 +568,6 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
 
 wxFontList::~wxFontList ()
 {
-#ifdef __WXMSW__
   wxNode *node = First ();
   while (node)
     {
@@ -583,7 +581,6 @@ wxFontList::~wxFontList ()
                delete font;
       node = next;
 }
-#endif
 }
 
 void wxFontList::AddFont (wxFont * font)