Added wxPGProperty::OnValidationFailure(); needed it and some other tweaks to allow...

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

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 9fa41bf7f469f4824b72bde1c7802a7c411b2c62..d53399562bd5a320671f15005507f42a3cb8676a 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -429,10 +429,10 @@ void wxWindowDCImpl::DoGetSize( int* width, int* height ) const
 }
 
 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);
 }


@@ -680,7 +680,7 @@ void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCo
     delete[] gpts;
 }
 
     delete[] gpts;
 }
 

-void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )
+void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode WXUNUSED(fillStyle) )

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


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

-                             int logical_func,
+                             wxRasterOperationMode logical_func,

                              bool useMask,
                              wxCoord xsrcMask, wxCoord ysrcMask )
 {
                              bool useMask,
                              wxCoord xsrcMask, wxCoord ysrcMask )
 {


@@ -1147,7 +1147,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
     wxCHECK_MSG( srcDC, false, "source must be a window DC" );
 
     // FIXME: this cast is not always valid, see the code using m_isMemDC
     wxCHECK_MSG( srcDC, false, "source must be a window DC" );
 
     // FIXME: this cast is not always valid, see the code using m_isMemDC

-    wxMemoryDCImpl *memDC = wx_static_cast(wxMemoryDCImpl *, srcDC);
+    wxMemoryDCImpl *memDC = static_cast<wxMemoryDCImpl *>(srcDC);

 
     bool use_bitmap_method = false;
     bool is_mono = false;
 
     bool use_bitmap_method = false;
     bool is_mono = false;


@@ -1882,7 +1882,7 @@ void wxWindowDCImpl::SetBackground( const wxBrush &brush )
     }
 }
 
     }
 }
 

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

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