Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index 0a7d137aca3df382b2b7de79017b13b176094aad..4e83cd78e62d872b79a7f8180d375db45e3ba785 100644 (file)
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -14,6 +14,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"

+    #include "wx/icon.h"

 #endif
 
 #include "wx/motif/dc.h"
 #endif
 
 #include "wx/motif/dc.h"


@@ -35,14 +36,14 @@ wxMotifDCImpl::wxMotifDCImpl(wxDC *owner)
 void wxMotifDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)
 {
     wxCHECK_RET( IsOk(), "invalid dc" );
 void wxMotifDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)
 {
     wxCHECK_RET( IsOk(), "invalid dc" );

-    wxCHECK_RET( icon.Ok(), "invalid icon" );
+    wxCHECK_RET( icon.IsOk(), "invalid icon" );

 
     DoDrawBitmap(icon, x, y, true);
 }
 
 void wxMotifDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {
 
     DoDrawBitmap(icon, x, y, true);
 }
 
 void wxMotifDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {

-    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
+    wxCHECK_RET( bitmap.IsOk(), "invalid bitmap" );

 
     wxMemoryDC memDC;
     memDC.SelectObjectAsSource(bitmap);
 
     wxMemoryDC memDC;
     memDC.SelectObjectAsSource(bitmap);