compilation fix for windows compilers: _wrename is declared in io.h

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

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index ea4a1f157100baf9ad95c456b0385006e46527a2..691d75777691d84244bf943b8c9df51acf14b611 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.h
+// Name:        wx/gtk1/dcmemory.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/dcclient.h"
 
@@ -22,26 +17,41 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxMemoryDC;
+class WXDLLIMPEXP_CORE wxMemoryDC;
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class wxMemoryDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
 public:
-  wxMemoryDC();
-  wxMemoryDC( wxDC *dc ); // Create compatible DC
-  ~wxMemoryDC();
-  virtual void SelectObject( const wxBitmap& bitmap );
-  void GetSize( int *width, int *height ) const;
-
-  // implementation
-
-  wxBitmap  m_selected;
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
+    wxMemoryDC( wxDC *dc ); // Create compatible DC
+    virtual ~wxMemoryDC();
+    void DoGetSize( int *width, int *height ) const;
+
+    // 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  m_selected;
+
+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+private:
+    void Init();
+
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
 #endif