Some WinCE fixes

[wxWidgets.git] / src / cocoa / dc.mm

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index 681663b4aa4e0f9c4b487540702f90681eb94362..d9e7e3af62682ed44f5ff6112b1ea5aac10a21c0 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -64,31 +64,21 @@ wxDC::~wxDC(void)
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

-    NSGraphicsContext *context = [NSGraphicsContext currentContext];
-    [context saveGraphicsState];
-

     NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,width,height)];
     [m_textForegroundColour.GetNSColor() set];
     [bezpath stroke];
     [m_brush.GetNSColor() set];
     [bezpath fill];
     NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,width,height)];
     [m_textForegroundColour.GetNSColor() set];
     [bezpath stroke];
     [m_brush.GetNSColor() set];
     [bezpath fill];

-
-    [context restoreGraphicsState];

 }
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
 }
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {

-    NSGraphicsContext *context = [NSGraphicsContext currentContext];
-    [context saveGraphicsState];
-

     NSBezierPath *bezpath = [NSBezierPath bezierPath];
     [bezpath moveToPoint:NSMakePoint(x1,y1)];
     [bezpath lineToPoint:NSMakePoint(x2,y2)];
 
     [m_textForegroundColour.GetNSColor() set];
     [bezpath stroke];
     NSBezierPath *bezpath = [NSBezierPath bezierPath];
     [bezpath moveToPoint:NSMakePoint(x1,y1)];
     [bezpath lineToPoint:NSMakePoint(x2,y2)];
 
     [m_textForegroundColour.GetNSColor() set];
     [bezpath stroke];

-
-    [context restoreGraphicsState];

 }
 
 void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, wxFont *theFont) const
 }
 
 void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, wxFont *theFont) const


@@ -120,6 +110,20 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
     [sm_cocoaNSTextStorage setAttributedString:attributedString];
     [attributedString release];
 
     [sm_cocoaNSTextStorage setAttributedString:attributedString];
     [attributedString release];
 

+    // Set the color (and later font) attributes
+    NSColor *fgColor = m_textForegroundColour.GetNSColor();
+    NSColor *bgColor = m_textBackgroundColour.GetNSColor();
+    if(!fgColor)
+        fgColor = [NSColor clearColor];
+    if(!bgColor)
+        bgColor = [NSColor clearColor];
+    NSDictionary *attrDict = [[NSDictionary alloc] initWithObjectsAndKeys:
+            fgColor, NSForegroundColorAttributeName,
+            bgColor, NSBackgroundColorAttributeName,
+            nil];
+    [sm_cocoaNSTextStorage addAttributes: attrDict range:NSMakeRange(0,[sm_cocoaNSTextStorage length])];
+    [attrDict release];
+

     NSRange glyphRange = [sm_cocoaNSLayoutManager glyphRangeForTextContainer:sm_cocoaNSTextContainer];
     NSRect usedRect = [sm_cocoaNSLayoutManager usedRectForTextContainer:sm_cocoaNSTextContainer];
     // NOTE: We'll crash trying to get the location of glyphAtIndex:0 if
     NSRange glyphRange = [sm_cocoaNSLayoutManager glyphRangeForTextContainer:sm_cocoaNSTextContainer];
     NSRect usedRect = [sm_cocoaNSLayoutManager usedRectForTextContainer:sm_cocoaNSTextContainer];
     // NOTE: We'll crash trying to get the location of glyphAtIndex:0 if


@@ -160,8 +164,8 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
     layoutLocation.x = 0.0;
     layoutLocation.y *= -1.0;
     layoutLocation.y += [[sm_cocoaNSLayoutManager typesetter] baselineOffsetInLayoutManager:sm_cocoaNSLayoutManager glyphIndex:0];
     layoutLocation.x = 0.0;
     layoutLocation.y *= -1.0;
     layoutLocation.y += [[sm_cocoaNSLayoutManager typesetter] baselineOffsetInLayoutManager:sm_cocoaNSLayoutManager glyphIndex:0];

-    // NOTE: That's NSMakePoint, not NSMakePint (working on that though)
-    [m_textForegroundColour.GetNSColor() set];
+    if(m_backgroundMode==wxSOLID)
+        [sm_cocoaNSLayoutManager drawBackgroundForGlyphRange:glyphRange  atPoint:NSZeroPoint];

     [sm_cocoaNSLayoutManager drawGlyphsForGlyphRange:glyphRange  atPoint:layoutLocation];
 
     [context restoreGraphicsState];
     [sm_cocoaNSLayoutManager drawGlyphsForGlyphRange:glyphRange  atPoint:layoutLocation];
 
     [context restoreGraphicsState];


@@ -347,8 +351,9 @@ void wxDC::Clear()
 {
 }
 
 {
 }
 

-void wxDC::SetBackground(const wxBrush&)
+void wxDC::SetBackground(const wxBrush& brush)

 {
 {

+    m_backgroundBrush = brush;

 }
 
 void wxDC::SetPalette(const wxPalette&)
 }
 
 void wxDC::SetPalette(const wxPalette&)