disabled wxStackWalker and wxCrashReport for Win64

[wxWidgets.git] / samples / drawing / drawing.cpp

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index f524b224f4f2721723ad9cba0c6c281875cebdd6..b462b1370da3a11248cfaafba13de9c43bcc665f 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -18,8 +18,8 @@
 // ----------------------------------------------------------------------------
 
 #if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation "drawing.cpp"
-    #pragma interface "drawing.cpp"
+    #pragma implementation
+    #pragma interface
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -513,11 +513,16 @@ void MyCanvas::DrawDefault(wxDC& dc)
     // mark the origin
     dc.DrawCircle(0, 0, 10);
 
+#if !wxMAC_USE_CORE_GRAPHICS
+    // GetPixel and FloodFill not supported by Mac OS X CoreGraphics
+    // (FloodFill uses Blit from a non-wxMemoryDC)
     //flood fill using brush, starting at 1,1 and replacing whatever colour we find there
     dc.SetBrush(wxBrush(wxColour(128,128,0), wxSOLID));
+
     wxColour tmpColour ;
     dc.GetPixel(1,1, &tmpColour);
     dc.FloodFill(1,1, tmpColour, wxFLOOD_SURFACE);
+#endif
 
     dc.DrawCheckMark(5, 80, 15, 15);
     dc.DrawCheckMark(25, 80, 30, 30);
@@ -664,7 +669,7 @@ void MyCanvas::DrawDefault(wxDC& dc)
 
     // Added by JACS to demonstrate bizarre behaviour.
     // With a size of 70, we get a missing red RHS,
-    // and the hight is too small, so we get yellow
+    // and the height is too small, so we get yellow
     // showing. With a size of 40, it draws as expected:
     // it just shows a white rectangle with red outline.
     int totalWidth = 70;
@@ -674,11 +679,12 @@ void MyCanvas::DrawDefault(wxDC& dc)
     wxMemoryDC memdc2;
     memdc2.SelectObject(bitmap2);
 
-    wxBrush yellowBrush(wxColour(255, 255, 0), wxSOLID);
+    wxColour clr(255, 255, 0);
+    wxBrush yellowBrush(clr, wxSOLID);
     memdc2.SetBackground(yellowBrush);
     memdc2.Clear();
 
-    wxPen yellowPen(wxColour(255, 255, 0), 1, wxSOLID);
+    wxPen yellowPen(clr, 1, wxSOLID);
 
     // Now draw a white rectangle with red outline. It should
     // entirely eclipse the yellow background.
@@ -951,7 +957,8 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 
     if ( m_owner->m_textureBackground) {
         if ( ! m_owner->m_backgroundBrush.Ok() ) {
-            wxBrush b(wxColour(0,128,0), wxSOLID);
+            wxColour clr(0,128,0);
+            wxBrush b(clr, wxSOLID);
             dc.SetBackground(b);
         }
     }