avoid deferred show with Fluxbox, its support for _NET_REQUEST_FRAME_EXTENTS is broken

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 37605f4750d2702adbffbbc3844ff3410f56e930..c84983ad851124b9e4f8c88dcdc369bdd3cc10fb 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -40,25 +40,25 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxMSWDCImpl)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxMSWDCImpl)
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )

         : wxMSWDCImpl( owner )
 {
         : wxMSWDCImpl( owner )
 {

-    CreateCompatible(NULL); 
-    Init(); 
+    CreateCompatible(NULL);
+    Init();

 }
 
 }
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) 
-        : wxMSWDCImpl( owner ) 
-{ 
-    CreateCompatible(NULL); 
-    Init(); 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+        : wxMSWDCImpl( owner )
+{
+    CreateCompatible(NULL);
+    Init();

     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc )
     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc )

-        : wxMSWDCImpl( owner ) 
+        : wxMSWDCImpl( owner )

 {
 {

-    wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") );
+    wxCHECK_RET( dc, wxT("NULL dc in wxMemoryDC ctor") );

 
     CreateCompatible(dc);
 
 
     CreateCompatible(dc);
 


@@ -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,16 +106,14 @@ 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;
         }
     }
 
     // check for whether the bitmap is already selected into a device context
     wxASSERT_MSG( !bitmap.GetSelectedInto() ||
             m_selectedBitmap = wxNullBitmap;
         }
     }
 
     // check for whether the bitmap is already selected into a device context
     wxASSERT_MSG( !bitmap.GetSelectedInto() ||

-                  (bitmap.GetSelectedInto() == this),
+                  (bitmap.GetSelectedInto() == GetOwner()),

                   wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 
     m_selectedBitmap = bitmap;
                   wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 
     m_selectedBitmap = bitmap;


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

-#ifdef __WXDEBUG__
-    m_selectedBitmap.SetSelectedInto(this);
-#endif
+    m_selectedBitmap.SetSelectedInto(GetOwner());

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