Added wxBufferedDC class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index d880f8316b1fc4e28b3963d8fce760299b33c2c6..0138b3af38acda219a51f8ed3adc22c8a50d5e58 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -73,6 +73,7 @@ calctrl.cpp   Generic
 caret.cpp      Generic NotMSW,NotMicro
 choicdgg.cpp   Generic
 colrdlgg.cpp   Generic Generic
+dcbuffer.cpp   Generic
 dcpsg.cpp      Generic
 dirctrlg.cpp   Generic
 dirdlgg.cpp    Generic NotWin32,NotOS2
@@ -782,6 +783,7 @@ dbgrid.h    WXH
 dbtable.h      WXH     Base
 dc.h   WXH
 dcclient.h     WXH
+dcbuffer.h     WXH
 dcmemory.h     WXH
 dcprint.h      WXH
 dcps.h WXH

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
new file mode 100644 (file)
index 0000000..ebb7bd1
--- /dev/null
+++ b/include/wx/dcbuffer.h
@@ -0,0 +1,103 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dcbuffer.h
+// Purpose:     wxBufferedDC class
+// Author:      Ron Lee <ron@debian.org>
+// Modified by:
+// Created:     16/03/02
+// RCS-ID:      $Id$
+// Copyright:   (c) Ron Lee
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_DCBUFFER_H_
+#define _WX_DCBUFFER_H_
+
+#ifdef __GNUG__
+#pragma interface "dcbuffer.h"
+#endif
+
+#include "wx/dcmemory.h"
+
+
+// ==============================================================
+//   Double buffering helper.
+// --------------------------------------------------------------
+
+class wxBufferedDC : public wxMemoryDC
+{
+private:
+
+        // Without the existence of a wxNullDC, this must be
+        // a pointer, else it could probably be a reference.
+
+    wxDC        *m_dc;
+    wxBitmap    m_buffer;
+
+public:
+
+        // Default ctor, must subsequently call Init for
+        // two stage construction.
+
+    wxBufferedDC()
+        : m_dc( 0 )
+    {}
+
+        // Construct a wxBufferedDC using a user supplied buffer.
+
+    wxBufferedDC( wxDC *dc, const wxBitmap &buffer );
+
+        // 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 );
+
+    // default copy ctor ok.
+
+        // The usually desired  action in the dtor is to blit the buffer.
+
+    ~wxBufferedDC();
+
+        // 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.
+
+    void Init( wxDC *dc, const wxBitmap &bitmap );
+    void Init( wxDC *dc, const wxSize &area );
+
+        // Blits the buffer to the dc, and detaches the dc from
+        // the buffer.  Usually called in the dtor or by the dtor
+        // of derived classes if the BufferedDC must blit before
+        // the derived class (which may own the dc it's blitting
+        // to) is destroyed.
+
+    void UnMask();
+};
+
+
+// ==============================================================
+//   Double buffered PaintDC.
+// --------------------------------------------------------------
+
+// Creates a double buffered wxPaintDC, optionally allowing the
+// user to specify their own buffer to use.
+
+class wxBufferedPaintDC : public wxBufferedDC
+{
+private:
+
+    wxPaintDC    m_paintdc;
+
+public:
+
+    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap );
+
+    // default copy ctor ok.
+
+    ~wxBufferedPaintDC();
+};
+
+
+#endif  // _WX_DCBUFFER_H_
+
+// vi:sts=4:sw=4:et

diff --git a/src/generic/dcbuffer.cpp b/src/generic/dcbuffer.cpp
new file mode 100644 (file)
index 0000000..8543ce6
--- /dev/null
+++ b/src/generic/dcbuffer.cpp
@@ -0,0 +1,103 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dcbuffer.cpp
+// Purpose:     wxBufferedDC class
+// Author:      Ron Lee <ron@debian.org>
+// Modified by:
+// Created:     16/03/02
+// RCS-ID:      $Id$
+// Copyright:   (c) Ron Lee
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+#ifdef __GNUG__
+    #pragma implementation "dcbuffer.h"
+#endif
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/dcbuffer.h"
+
+
+// ==============================================================
+//   Double buffering helper.
+// --------------------------------------------------------------
+
+wxBufferedDC::wxBufferedDC( wxDC *dc, const wxBitmap &buffer )
+    : m_dc( dc )
+    , m_buffer( buffer )
+{
+    SelectObject( m_buffer );
+}
+
+wxBufferedDC::wxBufferedDC( wxDC *dc, const wxSize &area )
+    : m_dc( dc )
+    , m_buffer( area.GetWidth(), area.GetHeight() )
+{
+    SelectObject( m_buffer );
+}
+
+wxBufferedDC::~wxBufferedDC()
+{
+    if( m_dc != 0 )
+    {
+        UnMask();
+    }
+}
+
+void wxBufferedDC::Init( wxDC *dc, const wxBitmap &buffer )
+{
+    wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
+                  _T("wxBufferedDC already initialised") );
+
+    m_dc = dc;
+    m_buffer = buffer;
+    SelectObject( m_buffer );
+}
+
+void wxBufferedDC::Init( wxDC *dc, const wxSize &area )
+{
+    wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
+                  _T("wxBufferedDC already initialised") );
+
+    m_dc = dc;
+    m_buffer = wxBitmap( area.GetWidth(), area.GetHeight() );
+    SelectObject( m_buffer );
+}
+
+void wxBufferedDC::UnMask()
+{
+    wxASSERT_MSG( m_dc != 0, _T("No low level DC associated with buffer (anymore)") );
+
+    m_dc->Blit( 0, 0, m_buffer.GetWidth(), m_buffer.GetHeight(), this, 0, 0 );
+    m_dc = 0;
+}
+
+
+// ==============================================================
+//   Double buffered PaintDC.
+// --------------------------------------------------------------
+
+wxBufferedPaintDC::wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer )
+    : m_paintdc( window )
+{
+    window->PrepareDC( m_paintdc );
+
+    if( buffer != wxNullBitmap )
+        Init( &m_paintdc, buffer );
+    else
+        Init( &m_paintdc, window->GetClientSize() );
+}
+
+wxBufferedPaintDC::~wxBufferedPaintDC()
+{
+        // We must UnMask here, else by the time the base class
+        // does it, the PaintDC will have already been destroyed.
+
+    UnMask();
+}
+
+
+// vi:sts=4:sw=4:et

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index a1d9b3173beb27060e22ff3e04b5c67fe29313d3..e593a84837d2dea89b6eaab4f23fc4cd0a8cd0b6 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -7,6 +7,7 @@ ALL_SOURCES = \
                generic/caret.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \
@@ -306,6 +307,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -751,6 +753,7 @@ GUIOBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \
@@ -862,6 +865,7 @@ GUI_LOWLEVEL_OBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index a1d9b3173beb27060e22ff3e04b5c67fe29313d3..e593a84837d2dea89b6eaab4f23fc4cd0a8cd0b6 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -7,6 +7,7 @@ ALL_SOURCES = \
                generic/caret.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \
@@ -306,6 +307,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -751,6 +753,7 @@ GUIOBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \
@@ -862,6 +865,7 @@ GUI_LOWLEVEL_OBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \

diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index 259e2d48defbb2d01e03dbaa1fbc1690441c69c0..41ab0e315aabe502f6d8b0cc13aa41de52e31d1e 100644 (file)
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -6,6 +6,7 @@ ALL_SOURCES = \
                generic/caret.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \
@@ -313,6 +314,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -777,6 +779,7 @@ GENERICOBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \

diff --git a/src/mac/files.lst b/src/mac/files.lst
index 259e2d48defbb2d01e03dbaa1fbc1690441c69c0..41ab0e315aabe502f6d8b0cc13aa41de52e31d1e 100644 (file)
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -6,6 +6,7 @@ ALL_SOURCES = \
                generic/caret.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \
@@ -313,6 +314,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -777,6 +779,7 @@ GENERICOBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \

diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index 0c866513948295d52071393ddff91f1858cebdd4..64f10dee4538b2c7ae96eb8f325ee3c40a903932 100644 (file)
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -7,6 +7,7 @@ ALL_SOURCES = \
                generic/caret.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \
@@ -268,6 +269,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -653,6 +655,7 @@ GENERICOBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 6313d2c0fdeb7c11bd2ce4b23e997fa6ed26b8fb..476204a2ec9050265f575f582e28e7418140d579 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -46,6 +46,7 @@ GENERICOBJS= accel.obj &
        caret.obj &
        choicdgg.obj &
        colrdlgg.obj &
+       dcbuffer.obj &
        dcpsg.obj &
        dirctrlg.obj &
        dirdlgg.obj &
@@ -934,6 +935,9 @@ choicdgg.obj:     $(GENDIR)\choicdgg.cpp
 colrdlgg.obj:     $(GENDIR)\colrdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcbuffer.obj:     $(GENDIR)\dcbuffer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dcpsg.obj:     $(GENDIR)\dcpsg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/microwin/files.lst b/src/microwin/files.lst
index 31cce0384f6e69af033f0834c6f580eda6b78957..3a3b0d99970ea4bd453692344865967a31f4a5a5 100644 (file)
--- a/src/microwin/files.lst
+++ b/src/microwin/files.lst
@@ -6,6 +6,7 @@ ALL_SOURCES = \
                generic/calctrl.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \
@@ -268,6 +269,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -745,6 +747,7 @@ GENERICOBJS = \
                calctrl.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 9487be7c065137572cd94c7f5f2038fdba529168..0feee931dd83abb299221e7d1e054cc4e5dc8c0e 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -6,6 +6,7 @@ ALL_SOURCES = \
                generic/caret.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \
@@ -297,6 +298,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -738,6 +740,7 @@ GENERICOBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \

diff --git a/src/msw/files.lst b/src/msw/files.lst
index 8e68f25ebb95386772037ef66c617cfcc561cd17..30ac7cf0dd1e9c76fce2117a087405323b3023fc 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -4,6 +4,7 @@ ALL_SOURCES = \
                generic/busyinfo.cpp \
                generic/calctrl.cpp \
                generic/choicdgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dragimgg.cpp \
@@ -327,6 +328,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -810,6 +812,7 @@ GENERICOBJS = \
                busyinfo.o \
                calctrl.o \
                choicdgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dragimgg.o \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 9aa4f72a75863aa37906bafb8a32ea3ec699a1d4..11dfa7440cec45c930b7f6d6432806712b60e7bc 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -74,6 +74,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dcbuffer.obj \
                $(MSWDIR)\dcpsg.obj \
                $(MSWDIR)\dirctrlg.obj \
                $(MSWDIR)\dragimgg.obj \
@@ -908,6 +909,8 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
+$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+
 $(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
 
 $(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 526845f116aa93f498da3d485b8ed42b8fa14437..b81044daeadabe3d2fe59a615d07698938fcada2 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -69,6 +69,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dcbuffer.obj \
                $(MSWDIR)\dcpsg.obj \
                $(MSWDIR)\dirctrlg.obj \
                $(MSWDIR)\dirdlgg.obj \
@@ -732,6 +733,8 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
+$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+
 $(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
 
 $(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 628d8a1bc9267d5f8aa3e4460568f204d9d4321b..25c21a00383729efe92bff285740cbf5f81e8678 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -52,6 +52,7 @@ MSWDIR=.
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
+               $(GENDIR)\dcbuffer.obj \
                $(GENDIR)\dcpsg.obj \
                $(GENDIR)\dirctrlg.obj \
                $(GENDIR)\dirdlgg.obj \
@@ -1339,6 +1340,11 @@ $(GENDIR)/choicdgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/dcbuffer.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/dcpsg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index f0b9403606b407a9b1962c38ae760ecafc38a5d6..4b63f3a301e4f219ead5c557b284e0d04569db37 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -82,6 +82,7 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/dcbuffer.$(OBJSUFF) \
                $(GENDIR)/dcpsg.$(OBJSUFF) \
                $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index c555f891b47d1a01fe0c3c7aae6ace8de45e8953..d888a7abc5eb47b6ef211abc2dee050722a31e05 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -28,6 +28,7 @@ MSWDIR=$(WXDIR)\src\msw
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
+               $(GENDIR)\dcbuffer.obj \
                $(GENDIR)\dcpsg.obj \
                $(GENDIR)\dirctrlg.obj \
                $(GENDIR)\dragimgg.obj \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index e5c5a967d00136b2b57a1fddf94184395709ec08..700d65326de2be5a0029b9661d53390735e436b0 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -91,6 +91,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\calctrl.obj \
                $(GENDIR)\$D\choicdgg.obj \
+               $(GENDIR)\$D\dcbuffer.obj \
                $(GENDIR)\$D\dcpsg.obj \
                $(GENDIR)\$D\dirctrlg.obj \
                $(GENDIR)\$D\dragimgg.obj \

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index ce15e03732d30a85813cc54eb6dfb4dcb98d4924..8e643b2343d5164cce87eea882f7addfcfc8a735 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -44,6 +44,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= busyinfo.obj &
        calctrl.obj &
        choicdgg.obj &
+       dcbuffer.obj &
        dcpsg.obj &
        dirctrlg.obj &
        dragimgg.obj &
@@ -1131,6 +1132,9 @@ calctrl.obj:     $(GENDIR)\calctrl.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcbuffer.obj:     $(GENDIR)\dcbuffer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dcpsg.obj:     $(GENDIR)\dcpsg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 9e8982d81525aeab4cf6e8c5c9ee0d05d305c263..ad591bf2b27759be5ed54195d355ba7892364a0f 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -613,6 +613,10 @@ SOURCE=.\generic\colrdlgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\dcbuffer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\dcpsg.cpp
 # End Source File
 # Begin Source File
@@ -1382,6 +1386,10 @@ SOURCE=..\include\wx\dc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dcbuffer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dcclient.h
 # End Source File
 # Begin Source File

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index dd069a2f0af3179f7d1ba224e4877df5b9489be4..4f6a991c8e416c6d6e7eb8458b7bb93ca014b271 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -770,6 +770,10 @@ SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\dcbuffer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\dcpsg.cpp
 # End Source File
 # Begin Source File
@@ -1658,6 +1662,10 @@ SOURCE=..\include\wx\dc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dcbuffer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dcclient.h
 # End Source File
 # Begin Source File

diff --git a/src/x11/files.lst b/src/x11/files.lst
index 528caf718215647ab1e798cfe27ff6584018eee3..82cdf6b6208606f9d21b5a6c68f1edad8079f724 100644 (file)
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -38,6 +38,7 @@ ALL_SOURCES = \
                generic/caret.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
+               generic/dcbuffer.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \
@@ -276,6 +277,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
+               dcbuffer.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \
@@ -765,6 +767,7 @@ GENERICOBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
+               dcbuffer.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \