Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

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

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 256db8c2f95bebb3531ff87164cbb2af9c5aed3a..b104fc55ba18bedfb3e97baa1d8c9c381b279da7 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -1,13 +1,45 @@
-#ifndef __DCMEMORYH_BASE__
-#define __DCMEMORYH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/dcmemory.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/dcmemory.h"
-#elif defined(__GTK__)
-#include "wx/gtk/dcmemory.h"
-#endif
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dcmemory.h
+// Purpose:     wxMemoryDC base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_DCMEMORY_H_BASE_
+#define _WX_DCMEMORY_H_BASE_
+
+#include "wx/dc.h"
+#include "wx/bitmap.h"
+
+//-----------------------------------------------------------------------------
+// wxMemoryDC
+//-----------------------------------------------------------------------------
+
+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)
+};
+
 
 #endif
-    // __DCMEMORYH_BASE__
+    // _WX_DCMEMORY_H_BASE_