Rename WX[F]FILE_LARGEFILE to wxHAS_LARGE_[F]FILES.

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

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 6916ff7eefdf2b3775b09285cf82248163ca632c..6e26da6f97e7bdcabac812949b2e1c4149cef4ca 100644 (file)
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -18,7 +18,7 @@
 
 // Split platforms into two groups - those which have well-working
 // double-buffering by default, and those which do not.
 
 // Split platforms into two groups - those which have well-working
 // double-buffering by default, and those which do not.

-#if defined(__WXMAC__) || defined(__WXGTK20__)
+#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__)

     #define wxALWAYS_NATIVE_DOUBLE_BUFFER       1
 #else
     #define wxALWAYS_NATIVE_DOUBLE_BUFFER       0
     #define wxALWAYS_NATIVE_DOUBLE_BUFFER       1
 #else
     #define wxALWAYS_NATIVE_DOUBLE_BUFFER       0


@@ -37,62 +37,62 @@
 // does not prepare the window DC
 #define wxBUFFER_CLIENT_AREA        0x02
 
 // does not prepare the window DC
 #define wxBUFFER_CLIENT_AREA        0x02
 

-class wxBufferedDC : public wxMemoryDC
+class WXDLLEXPORT wxBufferedDC : public wxMemoryDC

 {
 public:
     // Default ctor, must subsequently call Init for two stage construction.
 {
 public:
     // Default ctor, must subsequently call Init for two stage construction.

-    wxBufferedDC() : m_dc( 0 ), m_style(0)
+    wxBufferedDC()
+        : m_dc(NULL),
+          m_buffer(NULL),
+          m_style(0)

     {
     }
 
     // Construct a wxBufferedDC using a user supplied buffer.
     wxBufferedDC(wxDC *dc,
     {
     }
 
     // Construct a wxBufferedDC using a user supplied buffer.
     wxBufferedDC(wxDC *dc,

-                 const wxBitmap &buffer = wxNullBitmap,
+                 const wxBitmap& buffer = wxNullBitmap,

                  int style = wxBUFFER_CLIENT_AREA)
                  int style = wxBUFFER_CLIENT_AREA)

-        : m_dc( dc ),
-          m_buffer( buffer ),
-          m_style(style)
+        : m_dc(NULL),
+          m_buffer(NULL)

     {
     {

-        UseBuffer();
+        Init(dc, buffer, style);

     }
 
     // Construct a wxBufferedDC with an internal buffer of 'area'
     // (where area is usually something like the size of the window
     // being buffered)
     }
 
     // Construct a wxBufferedDC with an internal buffer of 'area'
     // (where area is usually something like the size of the window
     // being buffered)

-    wxBufferedDC(wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA)
-        : m_dc( dc ),
-          m_buffer( area.GetWidth(), area.GetHeight() ),
-          m_style(style)
+    wxBufferedDC(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA)
+        : m_dc(NULL),
+          m_buffer(NULL)

 
     {
 
     {

-        UseBuffer();
+        Init(dc, area, style);

     }
 
     }
 

-    // default copy ctor ok.
-

     // The usually desired  action in the dtor is to blit the buffer.
     virtual ~wxBufferedDC()
     {
     // The usually desired  action in the dtor is to blit the buffer.
     virtual ~wxBufferedDC()
     {

-        if ( m_dc ) UnMask();
+        if ( m_dc )
+            UnMask();

     }
 
     }
 

-    // These reimplement the actions of the ctors for two stage creation, but
-    // are not used by the ctors themselves to save a few cpu cycles.
+    // These reimplement the actions of the ctors for two stage creation

     void Init(wxDC *dc,
     void Init(wxDC *dc,

-              const wxBitmap &buffer=wxNullBitmap,
+              const wxBitmap& buffer = wxNullBitmap,

               int style = wxBUFFER_CLIENT_AREA)
     {
               int style = wxBUFFER_CLIENT_AREA)
     {

-        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
-                      _T("wxBufferedDC already initialised") );
-        m_dc = dc;
-        m_buffer = buffer;
-        m_style = style;
+        InitCommon(dc, style);
+
+        m_buffer = &buffer;
+

         UseBuffer();
     }
 
     void Init(wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA)
     {
         UseBuffer();
     }
 
     void Init(wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA)
     {

-        Init(dc, wxBitmap(area.GetWidth(), area.GetHeight()), style);
+        InitCommon(dc, style);
+
+        UseBuffer(area.x, area.y);

     }
 
     // Blits the buffer to the dc, and detaches the dc from the buffer (so it
     }
 
     // Blits the buffer to the dc, and detaches the dc from the buffer (so it


@@ -103,17 +103,16 @@ public:
     // blitting to) is destroyed.
     void UnMask()
     {
     // blitting to) is destroyed.
     void UnMask()
     {

-        wxASSERT_MSG( m_dc != 0,
-                      _T("No underlying DC associated with wxBufferedDC (anymore)") );
+        wxCHECK_RET( m_dc, _T("No underlying DC in wxBufferedDC") );

 
 

-        wxCoord x=0, y=0;
+        wxCoord x = 0,
+                y = 0;

 
 

-        if (m_style & wxBUFFER_CLIENT_AREA)
+        if ( m_style & wxBUFFER_CLIENT_AREA )

             GetDeviceOrigin(&x, &y);
 
             GetDeviceOrigin(&x, &y);
 

-        m_dc->Blit( 0, 0,
-                    m_buffer.GetWidth(), m_buffer.GetHeight(), this,
-                    -x, -y );
+        m_dc->Blit(0, 0, m_buffer->GetWidth(), m_buffer->GetHeight(),
+                   this, -x, -y );

         m_dc = NULL;
     }
 
         m_dc = NULL;
     }
 


@@ -122,19 +121,22 @@ public:
     int GetStyle() const { return m_style; }
 
 private:
     int GetStyle() const { return m_style; }
 
 private:

-    // check that the bitmap is valid and use it
-    void UseBuffer()
+    // common part of Init()s
+    void InitCommon(wxDC *dc, int style)

     {
     {

-        if (!m_buffer.Ok())
-        {
-            wxCoord w, h;
-            m_dc->GetSize(&w, &h);
-            m_buffer = wxBitmap(w, h);
-        }
-
-        SelectObject(m_buffer);
+        wxASSERT_MSG( !m_dc && !m_buffer, _T("wxBufferedDC already initialised") );
+        wxCHECK_RET( dc, _T("can't associate NULL DC with wxBufferedDC") );
+
+        m_dc = dc;
+        m_style = style;
+
+        // inherit the same layout direction as the original DC
+        SetLayoutDirection(dc->GetLayoutDirection());

     }
 
     }
 

+    // check that the bitmap is valid and use it
+    void UseBuffer(wxCoord w = -1, wxCoord h = -1);
+

     // the underlying DC to which we copy everything drawn on this one in
     // UnMask()
     //
     // the underlying DC to which we copy everything drawn on this one in
     // UnMask()
     //


@@ -143,11 +145,12 @@ private:
     wxDC *m_dc;
 
     // the buffer (selected in this DC)
     wxDC *m_dc;
 
     // the buffer (selected in this DC)

-    wxBitmap m_buffer;
+    const wxBitmap *m_buffer;

 
     // the buffering style
     int m_style;
 
 
     // the buffering style
     int m_style;
 

+    DECLARE_DYNAMIC_CLASS(wxBufferedDC)

     DECLARE_NO_COPY_CLASS(wxBufferedDC)
 };
 
     DECLARE_NO_COPY_CLASS(wxBufferedDC)
 };
 


@@ -158,7 +161,7 @@ private:
 
 // Creates a double buffered wxPaintDC, optionally allowing the
 // user to specify their own buffer to use.
 
 // Creates a double buffered wxPaintDC, optionally allowing the
 // user to specify their own buffer to use.

-class wxBufferedPaintDC : public wxBufferedDC
+class WXDLLEXPORT wxBufferedPaintDC : public wxBufferedDC

 {
 public:
     // If no bitmap is supplied by the user, a temporary one will be created.
 {
 public:
     // If no bitmap is supplied by the user, a temporary one will be created.


@@ -198,6 +201,7 @@ public:
 private:
     wxPaintDC m_paintdc;
 
 private:
     wxPaintDC m_paintdc;
 

+    DECLARE_ABSTRACT_CLASS(wxBufferedPaintDC)

     DECLARE_NO_COPY_CLASS(wxBufferedPaintDC)
 };
 
     DECLARE_NO_COPY_CLASS(wxBufferedPaintDC)
 };
 


@@ -236,7 +240,7 @@ private:
     {
         // Help the user to get the double-buffering working properly.
         wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_CUSTOM,
     {
         // Help the user to get the double-buffering working properly.
         wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_CUSTOM,

-                      wxT("In constructor, you need to call GetBackgroundStyle(wxBG_STYLE_CUSTOM), ")
+                      wxT("In constructor, you need to call SetBackgroundStyle(wxBG_STYLE_CUSTOM), ")

                       wxT("and also, if needed, paint the background manually in the paint event handler."));
     }
 
                       wxT("and also, if needed, paint the background manually in the paint event handler."));
     }
 


@@ -261,6 +265,5 @@ inline wxDC* wxAutoBufferedPaintDCFactory(wxWindow* window)
     else
         return new wxBufferedPaintDC(window);
 }
     else
         return new wxBufferedPaintDC(window);
 }

-            

 
 #endif  // _WX_DCBUFFER_H_
 
 #endif  // _WX_DCBUFFER_H_