Rename wxWebHistoryItem to wxWebViewHistoryItem.

[wxWidgets.git] / src / mgl / dcmemory.cpp

diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index c6c4233795bc6b9d01d99c59c9e57a04160e389d..a5a61a33f6d80593f4d597dec677436286e94875 100644 (file)
--- a/src/mgl/dcmemory.cpp
+++ b/src/mgl/dcmemory.cpp
@@ -24,23 +24,23 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
-wxMemoryDC::wxMemoryDC() : wxDC()
+void wxMemoryDC::Init()
 {
     m_isMemDC = true;
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc)) : wxDC()
 {
-    m_isMemDC = true;
+    Init();
 }
 
 wxMemoryDC::~wxMemoryDC()
 {
 }
 
-void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
+void wxMemoryDC::DoSelect(const wxBitmap& bitmap)
 {
-    if ( bitmap.Ok() )
+    if ( bitmap.IsOk() )
     {
         m_selected = bitmap;
         SetMGLDC(m_selected.CreateTmpDC(), TRUE);
@@ -49,7 +49,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 
 void wxMemoryDC::SetPen(const wxPen &pen)
 {
-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );
 
     if ( GetDepth() == 1 && *wxTRANSPARENT_PEN != pen )
     {
@@ -66,7 +66,7 @@ void wxMemoryDC::SetPen(const wxPen &pen)
 
 void wxMemoryDC::SetBrush(const wxBrush &brush)
 {
-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );
 
     if ( GetDepth() == 1 && *wxTRANSPARENT_BRUSH != brush )
     {
@@ -83,7 +83,7 @@ void wxMemoryDC::SetBrush(const wxBrush &brush)
 
 void wxMemoryDC::SetTextForeground(const wxColour &col)
 {
-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );
 
     if ( GetDepth() == 1 )
     {
@@ -100,7 +100,7 @@ void wxMemoryDC::SetTextForeground(const wxColour &col)
 
 void wxMemoryDC::SetTextBackground(const wxColour &col)
 {
-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );
 
     if ( GetDepth() == 1 )
     {