Avoid double free in wxComboBox::SetClientObject.

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

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 511030fac5037a34b387eea367cc71f1121aecda..2b5ef0bd096f71c17a7b0a866d17d2b0a9000fa5 100644 (file)
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -12,18 +12,19 @@
 #ifndef _WX_DCBUFFER_H_
 #define _WX_DCBUFFER_H_
 
 #ifndef _WX_DCBUFFER_H_
 #define _WX_DCBUFFER_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dcbuffer.h"
 #endif
 
 #include "wx/dcmemory.h"
 #pragma interface "dcbuffer.h"
 #endif
 
 #include "wx/dcmemory.h"

+#include "wx/dcclient.h"

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

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

 {
 private:
 
 {
 private:
 


@@ -84,7 +85,7 @@ public:
 // 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 WXDLLEXPORT wxBufferedPaintDC : public wxBufferedDC
+class WXDLLIMPEXP_ADV wxBufferedPaintDC : public wxBufferedDC

 {
 private:
 
 {
 private:
 


@@ -97,6 +98,8 @@ public:
     // default copy ctor ok.
 
     ~wxBufferedPaintDC();
     // default copy ctor ok.
 
     ~wxBufferedPaintDC();

+
+    DECLARE_NO_COPY_CLASS(wxBufferedPaintDC)

 };
 
 
 };