Implement icon text column using native GTK renderers in wxDVC.

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

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 812b108d80ffb668bb8046e8fbe349f8f9d84b18..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();
 


@@ -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;
         }