corrected/removed forward declarations

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 982dee3119854f803c17091ec162c570821d8d73..ff470015c82cedf04f4023ad7fd2d06901131946 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -7,43 +7,53 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTK_DCMEMORY_H_
+#define _WX_GTK_DCMEMORY_H_
 
-#ifndef __GTKDCMEMORYH__
-#define __GTKDCMEMORYH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+#include "wx/gtk/dcclient.h"
 
 //-----------------------------------------------------------------------------
-// classes
+// wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-class wxMemoryDC;
-
-//-----------------------------------------------------------------------------
-// wxMemoryDC
-//-----------------------------------------------------------------------------
-
-class wxMemoryDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
 public:
-  wxMemoryDC();
-  wxMemoryDC( wxDC *dc ); // Create compatible DC
-  ~wxMemoryDC();
-  virtual void SelectObject( const wxBitmap& bitmap );
-  void DoGetSize( int *width, int *height ) const;
-
-  // implementation
-
-  wxBitmap  m_selected;
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
+    
+    virtual ~wxMemoryDCImpl();
+
+    // these get reimplemented for mono-bitmaps to behave
+    // more like their Win32 couterparts. They now interpret
+    // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0
+    // and everything else as drawing 1.
+    virtual void SetPen( const wxPen &pen );
+    virtual void SetBrush( const wxBrush &brush );
+    virtual void SetBackground( const wxBrush &brush );
+    virtual void SetTextForeground( const wxColour &col );
+    virtual void SetTextBackground( const wxColour &col );
+
+    // overridden from wxDCImpl
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
+
+    // overridden for wxMemoryDC Impl
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+    virtual const wxBitmap& GetSelectedBitmap() const;
+    virtual wxBitmap& GetSelectedBitmap();
+
+private:
+    wxBitmap  m_selected;
+    
+    void Init();
+
+    DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
 };
 
-#endif
-    // __GTKDCMEMORYH__
+#endif 
+    // _WX_GTK_DCMEMORY_H_