suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxColour objects are not atomic

Browse Source 
svn: r2509
This commit is contained in:
Matthew Flatt 2006-03-26 03:33:25 +00:00
parent 542d29741d
commit 6d71c21bf3
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wxmac/src/base/wb_dc.cc
View File

@ -144,7 +144,7 @@ void wxbDC::DrawSpline(double x1, double y1, double x2, double y2, double x3, do
wxColor *wxbDC::GetBackground(void) 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) void wxbDC::SetLogicalOrigin(double x, double y)

16
src/wxmac/src/base/wb_gdi.cc
View File

@ -396,26 +396,26 @@ wxInitializeStockObjects (void)
{ {
wxColour *ctlGray; wxColour *ctlGray;
ctlGray = new WXGC_ATOMIC wxColour(0xE8, 0xE8, 0xE8); ctlGray = new WXGC_PTRS wxColour(0xE8, 0xE8, 0xE8);
wxREGGLOB(wxCONTROL_BACKGROUND_BRUSH); wxREGGLOB(wxCONTROL_BACKGROUND_BRUSH);
wxCONTROL_BACKGROUND_BRUSH = new WXGC_PTRS wxBrush(ctlGray, wxSOLID); wxCONTROL_BACKGROUND_BRUSH = new WXGC_PTRS wxBrush(ctlGray, wxSOLID);
wxCONTROL_BACKGROUND_BRUSH->Lock(1); wxCONTROL_BACKGROUND_BRUSH->Lock(1);
} }
wxREGGLOB(wxBLACK); wxREGGLOB(wxBLACK);
wxBLACK = new WXGC_ATOMIC wxColour ("BLACK"); wxBLACK = new WXGC_PTRS wxColour ("BLACK");
wxREGGLOB(wxWHITE); wxREGGLOB(wxWHITE);
wxWHITE = new WXGC_ATOMIC wxColour ("WHITE"); wxWHITE = new WXGC_PTRS wxColour ("WHITE");
wxREGGLOB(wxRED); wxREGGLOB(wxRED);
wxRED = new WXGC_ATOMIC wxColour ("RED"); wxRED = new WXGC_PTRS wxColour ("RED");
wxREGGLOB(wxBLUE); wxREGGLOB(wxBLUE);
wxBLUE = new WXGC_ATOMIC wxColour ("BLUE"); wxBLUE = new WXGC_PTRS wxColour ("BLUE");
wxREGGLOB(wxGREEN); wxREGGLOB(wxGREEN);
wxGREEN = new WXGC_ATOMIC wxColour ("GREEN"); wxGREEN = new WXGC_PTRS wxColour ("GREEN");
wxREGGLOB(wxCYAN); wxREGGLOB(wxCYAN);
wxCYAN = new WXGC_ATOMIC wxColour ("CYAN"); wxCYAN = new WXGC_PTRS wxColour ("CYAN");
wxREGGLOB(wxLIGHT_GREY); wxREGGLOB(wxLIGHT_GREY);
wxLIGHT_GREY = new WXGC_ATOMIC wxColour ("LIGHT GRAY"); wxLIGHT_GREY = new WXGC_PTRS wxColour ("LIGHT GRAY");
wxREGGLOB(wxSTANDARD_CURSOR); wxREGGLOB(wxSTANDARD_CURSOR);
wxSTANDARD_CURSOR = new WXGC_PTRS wxCursor (wxCURSOR_ARROW); wxSTANDARD_CURSOR = new WXGC_PTRS wxCursor (wxCURSOR_ARROW);

2
src/wxmac/src/mac/wx_canvs.cc
View File

@ -911,7 +911,7 @@ void wxCanvas::SetCanvasBackground(wxColor *c)
return; return;
if (c && c->IsMutable()) { if (c && c->IsMutable()) {
c = new WXGC_ATOMIC wxColour(c); c = new WXGC_PTRS wxColour(c);
c->Lock(1); c->Lock(1);
} }

6
src/wxmac/src/mac/wx_dc.cc
View File

@ -20,9 +20,9 @@ wxDC::wxDC(void)
{ {
cMacDC = NULL; cMacDC = NULL;
cMacCurrentTool = kNoTool; cMacCurrentTool = kNoTool;
current_background_color = new WXGC_ATOMIC wxColour(wxWHITE); current_background_color = new WXGC_PTRS wxColour(wxWHITE);
current_text_foreground = new WXGC_ATOMIC wxColour(wxBLACK); current_text_foreground = new WXGC_PTRS wxColour(wxBLACK);
current_text_background = new WXGC_ATOMIC wxColour(wxWHITE); current_text_background = new WXGC_PTRS wxColour(wxWHITE);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
src/wxmac/src/mac/wx_dcpr1.cc
View File

@ -92,7 +92,7 @@ wxPrinterDC::wxPrinterDC(wxPrintData *printData, Bool interactive) : wxCanvasDC(
current_pen = NULL; current_pen = NULL;
current_brush = NULL; current_brush = NULL;
current_text_foreground = new WXGC_ATOMIC wxColour(wxBLACK); current_text_foreground = new WXGC_PTRS wxColour(wxBLACK);
SetBrush(wxWHITE_BRUSH); SetBrush(wxWHITE_BRUSH);
SetPen(wxBLACK_PEN); SetPen(wxBLACK_PEN);
} }

14
src/wxmac/src/mac/wx_gdi.cc
View File

@ -425,7 +425,7 @@ wxPen::wxPen(void)
{ {
wxColour *c; wxColour *c;
c = new WXGC_ATOMIC wxColour(wxBLACK); c = new WXGC_PTRS wxColour(wxBLACK);
c->Lock(1); c->Lock(1);
colour = c; colour = c;
@ -449,7 +449,7 @@ wxbPen(col, Width, Style)
{ {
wxColour *c; wxColour *c;
c = new WXGC_ATOMIC wxColour(col); c = new WXGC_PTRS wxColour(col);
c->Lock(1); c->Lock(1);
colour = c; colour = c;
@ -468,7 +468,7 @@ wxbPen(col, Width, Style)
{ {
wxColour *c; wxColour *c;
c = new WXGC_ATOMIC wxColour(col); c = new WXGC_PTRS wxColour(col);
c->Lock(1); c->Lock(1);
colour = c; colour = c;
@ -488,7 +488,7 @@ wxBrush::wxBrush(void)
{ {
wxColour *c; wxColour *c;
c = new WXGC_ATOMIC wxColour(wxBLACK); c = new WXGC_PTRS wxColour(wxBLACK);
c->Lock(1); c->Lock(1);
colour = c; colour = c;
@ -506,7 +506,7 @@ wxBrush::wxBrush(wxColour *col, int Style)
{ {
wxColour *c; wxColour *c;
c = new WXGC_ATOMIC wxColour(col); c = new WXGC_PTRS wxColour(col);
c->Lock(1); c->Lock(1);
colour = c; colour = c;
@ -519,7 +519,7 @@ wxBrush::wxBrush(char *col, int Style)
{ {
wxColour *c; wxColour *c;
c = new WXGC_ATOMIC wxColour(col); c = new WXGC_PTRS wxColour(col);
c->Lock(1); c->Lock(1);
colour = c; 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; cMacCustomCursor = new WXGC_ATOMIC Cursor;