replace changes of r49890 by defining more compatibility operators in wxCmdLineArgsAr...

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 632afa38eccb19feb2e44a1cc54c495a71c92a00..d165b6176837f79d6e17d2eb90adba2221269a31 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -4,46 +4,69 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// 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"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMemoryDC;
-
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class wxMemoryDC: public wxWindowDC
-{
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKMemoryImplDC : public wxGTKWindowImplDC, public wxMemoryImplDCBase
+#else
+#define wxGTKMemoryImplDC wxMemoryDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
+#endif
+{
 public:
-  wxMemoryDC(void);
-  wxMemoryDC( wxDC *dc ); // Create compatible DC
-  ~wxMemoryDC(void);
-  virtual void SelectObject( const wxBitmap& bitmap );
-  void GetSize( int *width, int *height ) const;
 
-  // implementation      
+#if wxUSE_NEW_DC
+    wxGTKMemoryImplDC( wxMemoryDC *owner );
+    wxGTKMemoryImplDC( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxGTKMemoryImplDC( wxMemoryDC *owner, wxDC *dc );
+#else
+    wxMemoryDC();
+    wxMemoryDC(wxBitmap& bitmap);
+    wxMemoryDC( wxDC *dc );
+#endif
     
-  wxBitmap  m_selected;
-};
+    virtual ~wxGTKMemoryImplDC();
 
-#endif
-    // __GTKDCMEMORYH__
+    // 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 );
+
+    // implementation
+    wxBitmap GetSelectedBitmap() const { return m_selected; }
+
+protected:
+    // overridden from wxImplDC
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
+
+    // overridden from wxMemoryImplDCBase
+    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual const wxBitmap& DoGetSelectedBitmap() const;
+    virtual wxBitmap& DoGetSelectedBitmap();
+
+    wxBitmap  m_selected;
+    
+private:
+    void Init();
+
+    DECLARE_ABSTRACT_CLASS(wxGTKMemoryImplDC)
+};
 
+#endif // _WX_GTK_DCMEMORY_H_