Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index 02bc3d22fa0f0f96b393f25e36e2773514e2f48f..429c7b7a4b8131947ffc102353f384b8c87b58df 100644 (file)
--- a/src/dfb/dc.cpp
+++ b/src/dfb/dc.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxDFBDCImpl class
 // Author:      Vaclav Slavik
 // Created:     2006-08-07
-// RCS-ID:      $Id$
 // Copyright:   (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -239,7 +238,7 @@ void wxDFBDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
     // FIXME_DFB: implement special cases for common formats (RGB24,RGBA/RGB32)
 }
 
-void wxDFBDCImpl::DoDrawPolygon(int WXUNUSED(n), wxPoint WXUNUSED(points)[],
+void wxDFBDCImpl::DoDrawPolygon(int WXUNUSED(n), const wxPoint WXUNUSED(points)[],
                                 wxCoord WXUNUSED(xoffset), wxCoord WXUNUSED(yoffset),
                                 wxPolygonFillMode WXUNUSED(fillStyle))
 {
@@ -248,7 +247,7 @@ void wxDFBDCImpl::DoDrawPolygon(int WXUNUSED(n), wxPoint WXUNUSED(points)[],
     wxFAIL_MSG( "DrawPolygon not implemented" );
 }
 
-void wxDFBDCImpl::DoDrawLines(int WXUNUSED(n), wxPoint WXUNUSED(points)[],
+void wxDFBDCImpl::DoDrawLines(int WXUNUSED(n), const wxPoint WXUNUSED(points)[],
                               wxCoord WXUNUSED(xoffset), wxCoord WXUNUSED(yoffset))
 {
     wxCHECK_RET( IsOk(), wxT("invalid dc") );
@@ -346,7 +345,7 @@ void wxDFBDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
     // if background mode is solid, DrawText must paint text's background:
     if ( m_backgroundMode == wxSOLID )
     {
-        wxCHECK_RET( m_textBackgroundColour.Ok(),
+        wxCHECK_RET( m_textBackgroundColour.IsOk(),
                      wxT("invalid background color") );
 
         SelectColour(m_textBackgroundColour);
@@ -354,7 +353,7 @@ void wxDFBDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
     }
 
     // finally draw the text itself:
-    wxCHECK_RET( m_textForegroundColour.Ok(),
+    wxCHECK_RET( m_textForegroundColour.IsOk(),
                  wxT("invalid foreground color") );
     SelectColour(m_textForegroundColour);
     m_surface->DrawString(text.utf8_str(), -1, xx, yy, DSTF_LEFT | DSTF_TOP);
@@ -379,14 +378,14 @@ void wxDFBDCImpl::DoDrawRotatedText(const wxString& WXUNUSED(text),
 
 void wxDFBDCImpl::SetPen(const wxPen& pen)
 {
-    m_pen = pen.Ok() ? pen : DEFAULT_PEN;
+    m_pen = pen.IsOk() ? pen : DEFAULT_PEN;
 
     SelectColour(m_pen.GetColour());
 }
 
 void wxDFBDCImpl::SetBrush(const wxBrush& brush)
 {
-    m_brush = brush.Ok() ? brush : DEFAULT_BRUSH;
+    m_brush = brush.IsOk() ? brush : DEFAULT_BRUSH;
 }
 
 void wxDFBDCImpl::SelectColour(const wxColour& clr)
@@ -408,7 +407,7 @@ void wxDFBDCImpl::SetFont(const wxFont& font)
 {
     wxCHECK_RET( IsOk(), wxT("invalid dc") );
 
-    wxFont f(font.Ok() ? font : DEFAULT_FONT);
+    wxFont f(font.IsOk() ? font : DEFAULT_FONT);
 
     wxFont oldfont(m_font);
 
@@ -431,7 +430,7 @@ void wxDFBDCImpl::SetBackground(const wxBrush& brush)
 {
     wxCHECK_RET( IsOk(), wxT("invalid dc") );
 
-    if (!brush.Ok()) return;
+    if (!brush.IsOk()) return;
 
     m_backgroundBrush = brush;
 }
@@ -478,7 +477,7 @@ void wxDFBDCImpl::EndPage()
 wxCoord wxDFBDCImpl::GetCharHeight() const
 {
     wxCHECK_MSG( IsOk(), -1, wxT("invalid dc") );
-    wxCHECK_MSG( m_font.Ok(), -1, wxT("no font selected") );
+    wxCHECK_MSG( m_font.IsOk(), -1, wxT("no font selected") );
 
     int h = -1;
     GetCurrentFont()->GetHeight(&h);
@@ -488,7 +487,7 @@ wxCoord wxDFBDCImpl::GetCharHeight() const
 wxCoord wxDFBDCImpl::GetCharWidth() const
 {
     wxCHECK_MSG( IsOk(), -1, wxT("invalid dc") );
-    wxCHECK_MSG( m_font.Ok(), -1, wxT("no font selected") );
+    wxCHECK_MSG( m_font.IsOk(), -1, wxT("no font selected") );
 
     int w = -1;
     GetCurrentFont()->GetStringWidth("H", 1, &w);
@@ -502,8 +501,8 @@ void wxDFBDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
                            const wxFont *theFont) const
 {
     wxCHECK_RET( IsOk(), wxT("invalid dc") );
-    wxCHECK_RET( m_font.Ok(), wxT("no font selected") );
-    wxCHECK_RET( !theFont || theFont->Ok(), wxT("invalid font") );
+    wxCHECK_RET( m_font.IsOk(), wxT("no font selected") );
+    wxCHECK_RET( !theFont || theFont->IsOk(), wxT("invalid font") );
 
     wxFont oldFont;
     if ( theFont != NULL )
@@ -640,7 +639,7 @@ bool wxDFBDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
 void wxDFBDCImpl::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask)
 {
     wxCHECK_RET( IsOk(), wxT("invalid dc") );
-    wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") );
+    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") );
 
     DoDrawSubBitmap(bmp,
                     0, 0, bmp.GetWidth(), bmp.GetHeight(),
@@ -659,7 +658,7 @@ void wxDFBDCImpl::DoDrawSubBitmap(const wxBitmap &bmp,
                            wxCoord destx, wxCoord desty, int rop, bool useMask)
 {
     wxCHECK_RET( IsOk(), wxT("invalid dc") );
-    wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") );
+    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") );
 
     // NB: we could also support XOR here (via DSBLIT_XOR)
     //     and possibly others via SetSrc/DstBlendFunction()
@@ -675,9 +674,7 @@ void wxDFBDCImpl::DoDrawSubBitmap(const wxBitmap &bmp,
 
     if ( useMask && bmp.GetMask() )
     {
-        // FIXME_DFB: see MGL sources for a way to do it, but it's not directly
-        //            applicable because DirectFB doesn't implement ROPs; OTOH,
-        //            it has blitting modes that can be useful; finally, see
+        // FIXME_DFB: Could use blitting modes for this; also see
         //            DFB's SetSrcBlendFunction() and SetSrcColorKey()
         wxFAIL_MSG( "drawing bitmaps with masks not implemented" );
         return;