fix wxMotif build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 812b108d80ffb668bb8046e8fbe349f8f9d84b18..c731110b7eb947389e0ead2a762c1ef18c555984 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -879,7 +879,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
     if (m_pixmap && sourcePixmap)
     {
         /* MATTHEW: [9] */
-        int orig = m_logicalFunction;
+        wxRasterOperationMode orig = m_logicalFunction;
 
         SetLogicalFunction (rop);
 

diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index f912e633ba596699f03eff99189201259f3220ab..685289870bc9a3d0c4aba2fa9f6b3421bfdf0afd 100644 (file)
--- a/src/x11/region.cpp
+++ b/src/x11/region.cpp
@@ -84,7 +84,7 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
     XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
 }
 
-wxRegion::wxRegion( size_t WXUNUSED(n), const wxPoint *WXUNUSED(points), int WXUNUSED(fillStyle) )
+wxRegion::wxRegion( size_t WXUNUSED(n), const wxPoint *WXUNUSED(points), wxPolygonFillMode WXUNUSED(fillStyle) )
 {
 #if 0
     XPoint *xpoints = new XPoint[n];