allow compilation with wxUSE_CHOICEDLG set to 0

[wxWidgets.git] / include / wx / msw / dcmemory.h

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 85d83bd981d166dad853a31743fea3fd5e5a32e1..19ad43e38442507be632bb79d6081b02ba57fc36 100644 (file)
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.h
+// Name:        wx/msw/dcmemory.h
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dcmemory.h"
 #endif
 
@@ -24,15 +24,21 @@ public:
     wxMemoryDC();
     wxMemoryDC(wxDC *dc); // Create compatible DC
 
-    ~wxMemoryDC();
-
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void SelectObject(const wxBitmap& bitmap);
 
+protected:
+    // override some base class virtuals
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSize(int* width, int* height) const;
 
+    // create DC compatible with the given one or screen if dc == NULL
+    bool CreateCompatible(wxDC *dc);
+
+    // initialize the newly created DC
+    void Init();
+
 private:
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMemoryDC)
 };
 
 #endif