Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

[wxWidgets.git] / src / motif / dcclient.cpp

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 32f80903e4b29aa2e94705e8e1658297545cea6c..4622070bb8d7681230a037dc70e0bbea389da6fe 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -141,11 +141,11 @@ void wxWindowDCImpl::Init()
     m_currentPenWidth = 1;
     m_currentPenJoin = -1;
     m_currentPenDashCount = -1;
     m_currentPenWidth = 1;
     m_currentPenJoin = -1;
     m_currentPenDashCount = -1;

-    m_currentPenDash = (wxX11Dash*) NULL;
+    m_currentPenDash = NULL;

     m_currentStyle = -1;
     m_currentFill = -1;
     m_colour = wxColourDisplay();
     m_currentStyle = -1;
     m_currentFill = -1;
     m_colour = wxColourDisplay();

-    m_display = (WXDisplay*) NULL;
+    m_display = NULL;

     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;
     m_ok = false;
     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;
     m_ok = false;


@@ -161,7 +161,7 @@ wxWindowDCImpl::wxWindowDCImpl(wxDC *owner)
 wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *window)
               : wxMotifDCImpl(owner)
 {
 wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *window)
               : wxMotifDCImpl(owner)
 {

-    wxASSERT_MSG( (window != (wxWindow*) NULL), "You must pass a valid wxWindow to wxWindowDCImpl/wxClientDCImpl/wxPaintDCImpl constructor." );
+    wxASSERT_MSG( (window != NULL), "You must pass a valid wxWindow to wxWindowDCImpl/wxClientDCImpl/wxPaintDCImpl constructor." );

 
     Init();
 
 
     Init();
 


@@ -222,10 +222,10 @@ wxWindowDCImpl::~wxWindowDCImpl()
 }
 
 extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
 }
 
 extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,

-                          const wxColour & col, int style);
+                          const wxColour & col, wxFloodFillStyle style);

 
 bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y,
 
 bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y,

-                             const wxColour& col, int style)
+                             const wxColour& col, wxFloodFillStyle style)

 {
     return wxDoFloodFill(GetOwner(), x, y, col, style);
 }
 {
     return wxDoFloodFill(GetOwner(), x, y, col, style);
 }


@@ -471,7 +471,7 @@ void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCo
 }
 
 void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[],
 }
 
 void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[],

-                                wxCoord xoffset, wxCoord yoffset, int fillStyle )
+                                wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle )

 {
     wxCHECK_RET( IsOk(), "invalid dc" );
 
 {
     wxCHECK_RET( IsOk(), "invalid dc" );
 


@@ -790,7 +790,7 @@ bool wxWindowDCImpl::CanDrawBitmap() const
 bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,
 bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                         int rop, bool useMask,
+                         wxRasterOperationMode rop, bool useMask,

                          wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxCHECK_MSG( IsOk(), false, "invalid dc" );
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxCHECK_MSG( IsOk(), false, "invalid dc" );


@@ -836,7 +836,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
 
     // Do bitmap scaling if necessary
 
 
     // Do bitmap scaling if necessary
 

-    wxBitmap *scaledBitmap = (wxBitmap*) NULL;
+    wxBitmap *scaledBitmap = NULL;

     Pixmap sourcePixmap = (Pixmap) NULL;
     double scaleX, scaleY;
     GetUserScale(& scaleX, & scaleY);
     Pixmap sourcePixmap = (Pixmap) NULL;
     double scaleX, scaleY;
     GetUserScale(& scaleX, & scaleY);


@@ -879,7 +879,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
     if (m_pixmap && sourcePixmap)
     {
         /* MATTHEW: [9] */
     if (m_pixmap && sourcePixmap)
     {
         /* MATTHEW: [9] */

-        int orig = m_logicalFunction;
+        wxRasterOperationMode orig = m_logicalFunction;

 
         SetLogicalFunction (rop);
 
 
         SetLogicalFunction (rop);
 


@@ -1584,7 +1584,7 @@ void wxWindowDCImpl::SetPen( const wxPen &pen )
         case wxTRANSPARENT:
         default:
             style = LineSolid;
         case wxTRANSPARENT:
         default:
             style = LineSolid;

-            req_dash = (wxX11Dash*)NULL;
+            req_dash = NULL;

             req_nb_dash = 0;
         }
 
             req_nb_dash = 0;
         }
 


@@ -1736,7 +1736,9 @@ void wxWindowDCImpl::SetPen( const wxPen &pen )
             pixel = m_backgroundPixel;
         else
         {
             pixel = m_backgroundPixel;
         else
         {

-            pixel = CalculatePixel( (wxColour&) m_pen.GetColour(), m_currentColour, false);
+            wxColour penClr = m_pen.GetColour();
+            pixel = CalculatePixel( penClr, m_currentColour, false);
+            m_pen.SetColour(penClr);

         }
 
         // Finally, set the GC to the required colour
         }
 
         // Finally, set the GC to the required colour


@@ -1898,7 +1900,9 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush )
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR)
     {
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR)
     {

-        WXPixel pixel = CalculatePixel( (wxColour&) m_brush.GetColour(), m_currentColour, true);
+        wxColour brushClr = m_brush.GetColour();
+        WXPixel pixel = CalculatePixel( brushClr, m_currentColour, true);
+        m_brush.SetColour(brushClr);

 
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
 
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);


@@ -1926,7 +1930,7 @@ void wxWindowDCImpl::SetBackground( const wxBrush &brush )
                         m_backgroundPixel);
 }
 
                         m_backgroundPixel);
 }
 

-void wxWindowDCImpl::SetLogicalFunction( int function )
+void wxWindowDCImpl::SetLogicalFunction( wxRasterOperationMode function )

 {
     wxCHECK_RET( IsOk(), "invalid dc" );
 
 {
     wxCHECK_RET( IsOk(), "invalid dc" );