From 13b6e335236863073a5cd2e04e7cedf76a7475d7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 8 Mar 2001 18:28:43 +0000
Subject: [PATCH] fixed FindOrCreatePen/Brush() for the case when the object
 couldn't be created successfully

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt      |  1 +
 src/common/gdicmn.cpp | 82 ++++++++++++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 9ad280061b..914e6c9692 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -21,6 +21,7 @@ All (GUI):
 - new wxToggleButton class (John Norris, Axel Schlueter)
 - wxCalendarCtrl now highlighting the date with time part bug fixed
 - wxADJUST_MINSIZE sizer flag added
+- FindOrCreateBrush/Pen() bug fix for invalid colour values
 
 wxMSW:
 
diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index a9481d6f49..2c62bcefda 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -520,27 +520,35 @@ void wxPenList::RemovePen (wxPen * pen)
 
 wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
 {
-  for (wxNode * node = First (); node; node = node->Next ())
+    for (wxNode * node = First (); node; node = node->Next ())
+    {
+        wxPen *each_pen = (wxPen *) node->Data ();
+        if (each_pen &&
+                each_pen->GetVisible() &&
+                each_pen->GetWidth () == width &&
+                each_pen->GetStyle () == style &&
+                each_pen->GetColour ().Red () == colour.Red () &&
+                each_pen->GetColour ().Green () == colour.Green () &&
+                each_pen->GetColour ().Blue () == colour.Blue ())
+            return each_pen;
+    }
+
+    wxPen *pen = new wxPen (colour, width, style);
+    if ( !pen->Ok() )
     {
-      wxPen *each_pen = (wxPen *) node->Data ();
-      if (each_pen &&
-          each_pen->GetVisible() &&
-          each_pen->GetWidth () == width &&
-          each_pen->GetStyle () == style &&
-          each_pen->GetColour ().Red () == colour.Red () &&
-          each_pen->GetColour ().Green () == colour.Green () &&
-          each_pen->GetColour ().Blue () == colour.Blue ())
-        return each_pen;
+        // don't save the invalid pens in the list
+        delete pen;
+
+        return NULL;
     }
-  wxPen *pen = new wxPen (colour, width, style);
 
-  // Yes, we can return a pointer to this in a later FindOrCreatePen call,
-  // because we created it within FindOrCreatePen. Safeguards against
-  // returning a pointer to an automatic variable and hanging on to it
-  // (dangling pointer).
-  pen->SetVisible(TRUE);
+    // Yes, we can return a pointer to this in a later FindOrCreatePen call,
+    // because we created it within FindOrCreatePen. Safeguards against
+    // returning a pointer to an automatic variable and hanging on to it
+    // (dangling pointer).
+    pen->SetVisible(TRUE);
 
-  return pen;
+    return pen;
 }
 
 wxBrushList::~wxBrushList ()
@@ -563,27 +571,35 @@ void wxBrushList::AddBrush (wxBrush * brush)
 
 wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
 {
-  for (wxNode * node = First (); node; node = node->Next ())
+    for (wxNode * node = First (); node; node = node->Next ())
     {
-      wxBrush *each_brush = (wxBrush *) node->Data ();
-      if (each_brush &&
-          each_brush->GetVisible() &&
-          each_brush->GetStyle () == style &&
-          each_brush->GetColour ().Red () == colour.Red () &&
-          each_brush->GetColour ().Green () == colour.Green () &&
-          each_brush->GetColour ().Blue () == colour.Blue ())
-        return each_brush;
+        wxBrush *each_brush = (wxBrush *) node->Data ();
+        if (each_brush &&
+                each_brush->GetVisible() &&
+                each_brush->GetStyle () == style &&
+                each_brush->GetColour ().Red () == colour.Red () &&
+                each_brush->GetColour ().Green () == colour.Green () &&
+                each_brush->GetColour ().Blue () == colour.Blue ())
+            return each_brush;
     }
 
-  // Yes, we can return a pointer to this in a later FindOrCreateBrush call,
-  // because we created it within FindOrCreateBrush. Safeguards against
-  // returning a pointer to an automatic variable and hanging on to it
-  // (dangling pointer).
-  wxBrush *brush = new wxBrush (colour, style);
+    wxBrush *brush = new wxBrush (colour, style);
+
+    if ( !brush->Ok() )
+    {
+        // don't put the brushes we failed to create into the list
+        delete brush;
+
+        return NULL;
+    }
 
-  brush->SetVisible(TRUE);
+    brush->SetVisible(TRUE);
 
-  return brush;
+    // Yes, we can return a pointer to this in a later FindOrCreateBrush call,
+    // because we created it within FindOrCreateBrush. Safeguards against
+    // returning a pointer to an automatic variable and hanging on to it
+    // (dangling pointer).
+    return brush;
 }
 
 void wxBrushList::RemoveBrush (wxBrush * brush)
-- 
2.45.2