added spinctrl to be ignored when clicked (otherwise its siblings on the same window...

[wxWidgets.git] / src / mac / dc.cpp

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index de479fbeec167aca6d8ac00a15645229a45b819f..c6f0d29f89a8d4fe99ad307fccf4f260786d9b89 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -19,6 +19,7 @@
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/image.h"
+#include "wx/log.h"
 
 
 #if __MSL__ >= 0x6000
@@ -52,8 +53,6 @@ const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;
 
-#define wxMAC_EXPERIMENTAL_PATTERN 0
-
 wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
        m_ph( (GrafPtr) dc->m_macPort ) 
 {
@@ -650,9 +649,13 @@ void  wxDC::SetLogicalFunction( int function )
        m_macPenInstalled = false ;
 }
 
-void  wxDC::DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,
-                             int style )
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+                          const wxColour & col, int style);
+
+bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
+                       const wxColour& col, int style)
 {
+    return wxDoFloodFill(this, x, y, col, style);
 }
 
 bool  wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const 
@@ -870,12 +873,11 @@ void  wxDC::DoDrawPoint( wxCoord x, wxCoord y )
   
   if (m_pen.GetStyle() != wxTRANSPARENT) 
   {
-               MacInstallPen() ;
         wxCoord xx1 = XLOG2DEVMAC(x); 
         wxCoord yy1 = YLOG2DEVMAC(y);
-       
-               ::MoveTo(xx1,yy1);
-               ::LineTo(xx1+1, yy1+1);
+        RGBColor pencolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel());
+        ::SetCPixel( xx1,yy1,&pencolor) ;
+        CalcBoundingBox(x, y);
   }
 }
 
@@ -907,8 +909,8 @@ void  wxDC::DoDrawLines(int n, wxPoint points[],
 }
 
 void  wxDC::DoDrawPolygon(int n, wxPoint points[],
-                               wxCoord xoffset, wxCoord yoffset,
-                               int fillStyle )
+                          wxCoord xoffset, wxCoord yoffset,
+                          int fillStyle )
 {
        wxCHECK_RET(Ok(), wxT("Invalid DC"));
        wxMacPortSetter helper(this) ;
@@ -1199,7 +1201,6 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
        if ( LockPixels(bmappixels) )
        {
         wxMacPortSetter helper(this) ;
-        RGBColor tempColor ;
     
        if ( source->GetDepth() == 1 )
        {
@@ -1790,11 +1791,21 @@ void wxDC::MacInstallFont() const
 
 }
 
+Pattern gHatchPatterns[] =
+{   
+    { 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF } ,
+    { 0x01 , 0x02 , 0x04 , 0x08 , 0x10 , 0x20 , 0x40 , 0x80 } ,
+    { 0x80 , 0x40 , 0x20 , 0x10 , 0x08 , 0x04 , 0x02 , 0x01 } ,
+    { 0x10 , 0x10 , 0x10 , 0xFF , 0x10 , 0x10 , 0x10 , 0x10 } ,
+    { 0x00 , 0x00 , 0x00 , 0xFF , 0x00 , 0x00 , 0x00 , 0x00 } ,
+    { 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 } ,
+    { 0x81 , 0x42 , 0x24 , 0x18 , 0x18 , 0x24 , 0x42 , 0x81 } ,
+} ;
+
 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {
-    // we have our own pattern list now
-       int thePatListID = 128;
-       int theIndex;
+       int theIndex = 1 ;
+       
        switch(hatchStyle)
        {
                case wxBDIAGONAL_HATCH:
@@ -1819,7 +1830,7 @@ static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
                        theIndex = 1; // solid pattern
                        break;
        }
-       GetIndPattern( pattern, thePatListID, theIndex);        
+       *pattern = gHatchPatterns[theIndex-1] ; 
 }
 
 void wxDC::MacInstallPen() const