From 6d71c21bf320798db4308112ac985000fc91064d Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 26 Mar 2006 03:33:25 +0000
Subject: [PATCH] wxColour objects are not atomic

svn: r2509
---
 src/wxmac/src/base/wb_dc.cc   |  2 +-
 src/wxmac/src/base/wb_gdi.cc  | 16 ++++++++--------
 src/wxmac/src/mac/wx_canvs.cc |  2 +-
 src/wxmac/src/mac/wx_dc.cc    |  6 +++---
 src/wxmac/src/mac/wx_dcpr1.cc |  2 +-
 src/wxmac/src/mac/wx_gdi.cc   | 14 +++++++-------
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/wxmac/src/base/wb_dc.cc b/src/wxmac/src/base/wb_dc.cc
index 9d5c86f01a..9d3495a387 100644
--- a/src/wxmac/src/base/wb_dc.cc
+++ b/src/wxmac/src/base/wb_dc.cc
@@ -144,7 +144,7 @@ void wxbDC::DrawSpline(double x1, double y1, double x2, double y2, double x3, do
 
 wxColor *wxbDC::GetBackground(void)
 { 
-  return new WXGC_ATOMIC wxColour(current_background_color);
+  return new WXGC_PTRS wxColour(current_background_color);
 }
 
 void wxbDC::SetLogicalOrigin(double x, double y)
diff --git a/src/wxmac/src/base/wb_gdi.cc b/src/wxmac/src/base/wb_gdi.cc
index 270b3a5259..e714b2430c 100644
--- a/src/wxmac/src/base/wb_gdi.cc
+++ b/src/wxmac/src/base/wb_gdi.cc
@@ -396,26 +396,26 @@ wxInitializeStockObjects (void)
   
   {
     wxColour *ctlGray;
-    ctlGray = new WXGC_ATOMIC wxColour(0xE8, 0xE8, 0xE8);
+    ctlGray = new WXGC_PTRS wxColour(0xE8, 0xE8, 0xE8);
     wxREGGLOB(wxCONTROL_BACKGROUND_BRUSH);
     wxCONTROL_BACKGROUND_BRUSH = new WXGC_PTRS wxBrush(ctlGray, wxSOLID);
     wxCONTROL_BACKGROUND_BRUSH->Lock(1);
   }
 
   wxREGGLOB(wxBLACK);
-  wxBLACK = new WXGC_ATOMIC wxColour ("BLACK");
+  wxBLACK = new WXGC_PTRS wxColour ("BLACK");
   wxREGGLOB(wxWHITE);
-  wxWHITE = new WXGC_ATOMIC wxColour ("WHITE");
+  wxWHITE = new WXGC_PTRS wxColour ("WHITE");
   wxREGGLOB(wxRED);
-  wxRED = new WXGC_ATOMIC wxColour ("RED");
+  wxRED = new WXGC_PTRS wxColour ("RED");
   wxREGGLOB(wxBLUE);
-  wxBLUE = new WXGC_ATOMIC wxColour ("BLUE");
+  wxBLUE = new WXGC_PTRS wxColour ("BLUE");
   wxREGGLOB(wxGREEN);
-  wxGREEN = new WXGC_ATOMIC wxColour ("GREEN");
+  wxGREEN = new WXGC_PTRS wxColour ("GREEN");
   wxREGGLOB(wxCYAN);
-  wxCYAN = new WXGC_ATOMIC wxColour ("CYAN");
+  wxCYAN = new WXGC_PTRS wxColour ("CYAN");
   wxREGGLOB(wxLIGHT_GREY);
-  wxLIGHT_GREY = new WXGC_ATOMIC wxColour ("LIGHT GRAY");
+  wxLIGHT_GREY = new WXGC_PTRS wxColour ("LIGHT GRAY");
 
   wxREGGLOB(wxSTANDARD_CURSOR);
   wxSTANDARD_CURSOR = new WXGC_PTRS wxCursor (wxCURSOR_ARROW);
diff --git a/src/wxmac/src/mac/wx_canvs.cc b/src/wxmac/src/mac/wx_canvs.cc
index 377e07990f..bd908b602c 100644
--- a/src/wxmac/src/mac/wx_canvs.cc
+++ b/src/wxmac/src/mac/wx_canvs.cc
@@ -911,7 +911,7 @@ void wxCanvas::SetCanvasBackground(wxColor *c)
     return;
   
   if (c && c->IsMutable()) {
-    c = new WXGC_ATOMIC wxColour(c);
+    c = new WXGC_PTRS wxColour(c);
     c->Lock(1);
   }
    
diff --git a/src/wxmac/src/mac/wx_dc.cc b/src/wxmac/src/mac/wx_dc.cc
index 746c64db05..63806c40df 100644
--- a/src/wxmac/src/mac/wx_dc.cc
+++ b/src/wxmac/src/mac/wx_dc.cc
@@ -20,9 +20,9 @@ wxDC::wxDC(void)
 {
   cMacDC = NULL;
   cMacCurrentTool = kNoTool;
-  current_background_color = new WXGC_ATOMIC wxColour(wxWHITE);
-  current_text_foreground = new WXGC_ATOMIC wxColour(wxBLACK);
-  current_text_background = new WXGC_ATOMIC wxColour(wxWHITE);
+  current_background_color = new WXGC_PTRS wxColour(wxWHITE);
+  current_text_foreground = new WXGC_PTRS wxColour(wxBLACK);
+  current_text_background = new WXGC_PTRS wxColour(wxWHITE);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/wxmac/src/mac/wx_dcpr1.cc b/src/wxmac/src/mac/wx_dcpr1.cc
index 9d1b524913..afd276f66e 100644
--- a/src/wxmac/src/mac/wx_dcpr1.cc
+++ b/src/wxmac/src/mac/wx_dcpr1.cc
@@ -92,7 +92,7 @@ wxPrinterDC::wxPrinterDC(wxPrintData *printData, Bool interactive) : wxCanvasDC(
 
   current_pen = NULL;
   current_brush = NULL;
-  current_text_foreground = new WXGC_ATOMIC wxColour(wxBLACK);
+  current_text_foreground = new WXGC_PTRS wxColour(wxBLACK);
   SetBrush(wxWHITE_BRUSH);
   SetPen(wxBLACK_PEN);
 }
diff --git a/src/wxmac/src/mac/wx_gdi.cc b/src/wxmac/src/mac/wx_gdi.cc
index d35d39b228..719f7a17fc 100644
--- a/src/wxmac/src/mac/wx_gdi.cc
+++ b/src/wxmac/src/mac/wx_gdi.cc
@@ -425,7 +425,7 @@ wxPen::wxPen(void)
 {
   wxColour *c;
   
-  c = new WXGC_ATOMIC wxColour(wxBLACK);
+  c = new WXGC_PTRS wxColour(wxBLACK);
   c->Lock(1);
   colour = c;
   
@@ -449,7 +449,7 @@ wxbPen(col, Width, Style)
 {
   wxColour *c;
   
-  c = new WXGC_ATOMIC wxColour(col);
+  c = new WXGC_PTRS wxColour(col);
   c->Lock(1);
   colour = c;
   
@@ -468,7 +468,7 @@ wxbPen(col, Width, Style)
 {
   wxColour *c;
   
-  c = new WXGC_ATOMIC wxColour(col);
+  c = new WXGC_PTRS wxColour(col);
   c->Lock(1);
   colour = c;
   
@@ -488,7 +488,7 @@ wxBrush::wxBrush(void)
 {
   wxColour *c;
   
-  c = new WXGC_ATOMIC wxColour(wxBLACK);
+  c = new WXGC_PTRS wxColour(wxBLACK);
   c->Lock(1);
   
   colour = c;
@@ -506,7 +506,7 @@ wxBrush::wxBrush(wxColour *col, int Style)
 {
   wxColour *c;
   
-  c = new WXGC_ATOMIC wxColour(col);
+  c = new WXGC_PTRS wxColour(col);
   c->Lock(1);
   colour = c;
   
@@ -519,7 +519,7 @@ wxBrush::wxBrush(char *col, int Style)
 {
   wxColour *c;
   
-  c = new WXGC_ATOMIC wxColour(col);
+  c = new WXGC_PTRS wxColour(col);
   c->Lock(1);
   colour = c;
   
@@ -600,7 +600,7 @@ wxCursor::wxCursor(wxBitmap *mask, wxBitmap *bm, int hotSpotX, int hotSpotY)
     }
   }
 
-  c = new WXGC_ATOMIC wxColour(); /* to recieve bit values */
+  c = new WXGC_PTRS wxColour(); /* to recieve bit values */
 
   cMacCustomCursor = new WXGC_ATOMIC Cursor;