force wxUSE_THREADS/EXCEPTIONS to 0 if wxNO_THREADS/EXCEPTIONS is defined

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

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index b29469ce2ac57b1067ec9c5c393c925ac6831b22..9cd95e0ac3e2e2f048051352ea63c62292146317 100644 (file)
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -14,13 +14,13 @@
 
 #include "wx/dcmemory.h"
 #include "wx/dcclient.h"
 
 #include "wx/dcmemory.h"
 #include "wx/dcclient.h"

-
+#include "wx/window.h"

 
 // ----------------------------------------------------------------------------
 // Double buffering helper.
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Double buffering helper.
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxBufferedDC : public wxMemoryDC
+class 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.


@@ -81,9 +81,9 @@ public:
         wxASSERT_MSG( m_dc != 0,
                       _T("No underlying DC associated with wxBufferedDC (anymore)") );
 
         wxASSERT_MSG( m_dc != 0,
                       _T("No underlying DC associated with wxBufferedDC (anymore)") );
 

-        m_dc->Blit( m_dc->DeviceToLogicalX(0), m_dc->DeviceToLogicalY(0),
+        m_dc->Blit( 0, 0,

                     m_buffer.GetWidth(), m_buffer.GetHeight(), this,
                     m_buffer.GetWidth(), m_buffer.GetHeight(), this,

-                    DeviceToLogicalX(0), DeviceToLogicalY(0) );
+                    0, 0 );

         m_dc = NULL;
     }
 
         m_dc = NULL;
     }
 


@@ -116,13 +116,15 @@ 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 WXDLLIMPEXP_ADV wxBufferedPaintDC : public wxBufferedDC
+class wxBufferedPaintDC : public wxBufferedDC

 {
 public:
     // If no bitmap is supplied by the user, a temporary one wil; be created.
     wxBufferedPaintDC(wxWindow *window, const wxBitmap& buffer = wxNullBitmap)
         : m_paintdc(window)
     {
 {
 public:
     // If no bitmap is supplied by the user, a temporary one wil; be created.
     wxBufferedPaintDC(wxWindow *window, const wxBitmap& buffer = wxNullBitmap)
         : m_paintdc(window)
     {

+        window->PrepareDC( m_paintdc );
+

         if( buffer != wxNullBitmap )
             Init(&m_paintdc, buffer);
         else
         if( buffer != wxNullBitmap )
             Init(&m_paintdc, buffer);
         else