make wxSetEnv compatible with ANSI and Unicode, deprecate passing NULL to it in favou...

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

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index c5854c5110f9c8c3945f0576004d952c883c947e..691d75777691d84244bf943b8c9df51acf14b611 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -1,21 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.h
+// Name:        wx/gtk1/dcmemory.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/dcclient.h"
 
 #include "wx/defs.h"
 #include "wx/dcclient.h"
 


@@ -23,26 +17,41 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxMemoryDC;
+class WXDLLIMPEXP_CORE wxMemoryDC;

 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
-    wxMemoryDC(void);
+public:
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }

     wxMemoryDC( wxDC *dc ); // Create compatible DC
     wxMemoryDC( wxDC *dc ); // Create compatible DC

-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height ) const;
-
-  private: 
-    friend wxPaintDC;
+    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;
     wxBitmap  m_selected;

+
+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+private:
+    void Init();
+
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)

 };
 
 #endif
 };
 
 #endif