PCH-less compilation fix

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

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index af42e0135d24adde739944869461cad475c37bf0..9618b55a221895e114c39b1dfaa256b84a418fcb 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -12,9 +12,53 @@
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 

-#include "wx/defs.h"
+#include "wx/dc.h"

 #include "wx/bitmap.h"
 
 #include "wx/bitmap.h"
 

+
+#if wxUSE_NEW_DC
+
+//-----------------------------------------------------------------------------
+// wxMemoryDC
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxMemoryImplDCBase
+{
+public:
+    wxMemoryImplDCBase() { }
+
+    virtual void DoSelect(const wxBitmap& bmp) = 0;
+    
+    virtual const wxBitmap& DoGetSelectedBitmap() const = 0;
+    virtual wxBitmap& DoGetSelectedBitmap() = 0;
+};
+
+
+class WXDLLIMPEXP_CORE wxMemoryDC: public wxDC
+{
+public:
+    wxMemoryDC();
+    wxMemoryDC( wxBitmap& bitmap );
+    wxMemoryDC( wxDC *dc );
+    
+    // select the given bitmap to draw on it
+    void SelectObject(wxBitmap& bmp);
+
+    // select the given bitmap for read-only
+    void SelectObjectAsSource(const wxBitmap& bmp);
+    
+    // get selected bitmap
+    const wxBitmap& GetSelectedBitmap() const;
+    wxBitmap& GetSelectedBitmap();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+};
+    
+
+
+#else
+

 // NOTE: different native implementations of wxMemoryDC will derive from
 //       different wxDC classes (wxPaintDC, wxWindowDC, etc), so that
 //       we cannot derive wxMemoryDCBase from wxDC and then use it as the
 // NOTE: different native implementations of wxMemoryDC will derive from
 //       different wxDC classes (wxPaintDC, wxWindowDC, etc), so that
 //       we cannot derive wxMemoryDCBase from wxDC and then use it as the


@@ -45,9 +89,14 @@ public:
         DoSelect(bmp);
     }
 
         DoSelect(bmp);
     }
 

+protected:

     virtual void DoSelect(const wxBitmap& bmp) = 0;
 };
 
     virtual void DoSelect(const wxBitmap& bmp) = 0;
 };
 

+
+#endif
+
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcmemory.h"
 #elif defined(__WXMSW__)
 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcmemory.h"
 #elif defined(__WXMSW__)