compilation fix after last commit

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 1ad90bbb837e0b5da9dea832b1484548d0bcbb82..d399b5157b4b85b9846c143ed744b30d73ca15f7 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -80,9 +80,9 @@ void wxMemoryDCImpl::Init()
 
 bool wxMemoryDCImpl::CreateCompatible(wxDC *dc)
 {
 
 bool wxMemoryDCImpl::CreateCompatible(wxDC *dc)
 {

-    wxDCImpl *impl = dc->GetImpl();
+    wxDCImpl *impl = dc ? dc->GetImpl() : NULL ;

     wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
     wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );

-    if (!msw_impl)
+    if ( dc && !msw_impl)

     {
         m_ok = false;
         return false;
     {
         m_ok = false;
         return false;


@@ -106,9 +106,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
         ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap);
         if ( m_selectedBitmap.Ok() )
         {
         ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap);
         if ( m_selectedBitmap.Ok() )
         {

-#ifdef __WXDEBUG__

             m_selectedBitmap.SetSelectedInto(NULL);
             m_selectedBitmap.SetSelectedInto(NULL);

-#endif

             m_selectedBitmap = wxNullBitmap;
         }
     }
             m_selectedBitmap = wxNullBitmap;
         }
     }


@@ -123,9 +121,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
     if ( !hBmp )
         return;
 
     if ( !hBmp )
         return;
 

-#ifdef __WXDEBUG__

     m_selectedBitmap.SetSelectedInto(GetOwner());
     m_selectedBitmap.SetSelectedInto(GetOwner());

-#endif

     hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp);
 
     if ( !hBmp )
     hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp);
 
     if ( !hBmp )