Return the old file descriptor/pointer from wx(F)File::Detach().

[wxWidgets.git] / include / wx / dcbuffer.h

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 4d5b4087124d476a8995c6bb6aca1589ae3b6442..f4d27c7fb80077b0a2f545f973c845044e1a33cc 100644 (file)
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -4,7 +4,6 @@
 // Author:      Ron Lee <ron@debian.org>
 // Modified by: Vadim Zeitlin (refactored, added bg preservation)
 // Created:     16/03/02
 // Author:      Ron Lee <ron@debian.org>
 // Modified by: Vadim Zeitlin (refactored, added bg preservation)
 // Created:     16/03/02

-// RCS-ID:      $Id$

 // Copyright:   (c) Ron Lee
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Ron Lee
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -112,14 +111,10 @@ private:
     // common part of Init()s
     void InitCommon(wxDC *dc, int style)
     {
     // common part of Init()s
     void InitCommon(wxDC *dc, int style)
     {

-        wxASSERT_MSG( !m_dc, _T("wxBufferedDC already initialised") );
+        wxASSERT_MSG( !m_dc, wxT("wxBufferedDC already initialised") );

 
         m_dc = dc;
         m_style = style;
 
         m_dc = dc;
         m_style = style;

-
-        // inherit the same layout direction as the original DC
-        if (dc && dc->IsOk())
-            SetLayoutDirection(dc->GetLayoutDirection());

     }
 
     // check that the bitmap is valid and use it
     }
 
     // check that the bitmap is valid and use it


@@ -138,6 +133,8 @@ private:
     // the buffering style
     int m_style;
 
     // the buffering style
     int m_style;
 

+    wxSize m_area;
+    

     DECLARE_DYNAMIC_CLASS(wxBufferedDC)
     wxDECLARE_NO_COPY_CLASS(wxBufferedDC);
 };
     DECLARE_DYNAMIC_CLASS(wxBufferedDC)
     wxDECLARE_NO_COPY_CLASS(wxBufferedDC);
 };


@@ -223,8 +220,8 @@ public:
     wxAutoBufferedPaintDC(wxWindow* win)
         : wxAutoBufferedPaintDCBase(win)
     {
     wxAutoBufferedPaintDC(wxWindow* win)
         : wxAutoBufferedPaintDCBase(win)
     {

-        wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_CUSTOM,
-            "You need to call SetBackgroundStyle(wxBG_STYLE_CUSTOM) in ctor, "
+        wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_PAINT,
+            "You need to call SetBackgroundStyle(wxBG_STYLE_PAINT) in ctor, "

             "and also, if needed, paint the background in wxEVT_PAINT handler."
         );
     }
             "and also, if needed, paint the background in wxEVT_PAINT handler."
         );
     }