Rename wxWebHistoryItem to wxWebViewHistoryItem.

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

diff --git a/src/dfb/dcmemory.cpp b/src/dfb/dcmemory.cpp
index 4f274d960cec7c21a45b4ac534a31b529788234c..8929ca41ce5501fb559dce2e8165998431937f68 100644 (file)
--- a/src/dfb/dcmemory.cpp
+++ b/src/dfb/dcmemory.cpp
@@ -23,6 +23,7 @@
     #include "wx/bitmap.h"
 #endif
 
     #include "wx/bitmap.h"
 #endif
 

+#include "wx/dcmemory.h"

 #include "wx/dfb/dcmemory.h"
 #include "wx/dfb/private.h"
 
 #include "wx/dfb/dcmemory.h"
 #include "wx/dfb/private.h"
 


@@ -42,6 +43,19 @@ void wxMemoryDCImpl::Init()
 {
 }
 
 {
 }
 

+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner)
+              : wxDFBDCImpl(owner)
+{
+    Init();
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+              : wxDFBDCImpl(owner)
+{
+    Init();
+    DoSelect(bitmap);
+}
+

 wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc))
               : wxDFBDCImpl(owner)
 {
 wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc))
               : wxDFBDCImpl(owner)
 {


@@ -51,7 +65,7 @@ void wxMemoryDCImpl::DoSelect(const wxBitmap& bitmap)
 {
     m_bmp = bitmap;
 
 {
     m_bmp = bitmap;
 

-    if ( !bitmap.Ok() )
+    if ( !bitmap.IsOk() )

     {
         // select the bitmap out of the DC
         m_surface = NULL;
     {
         // select the bitmap out of the DC
         m_surface = NULL;