added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index be4a0ffa42091c250da74c3e2f4723a095a042ea..78b712ef4260f28e98dab3f023b0ed6c38d44832 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -4,14 +4,14 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -28,20 +28,30 @@ class wxMemoryDC;
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 

-class wxMemoryDC: public wxPaintDC
+class wxMemoryDC : public wxWindowDC

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
-    wxMemoryDC(void);
+public:
+    wxMemoryDC();

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

-    ~wxMemoryDC(void);
+    ~wxMemoryDC();

     virtual void SelectObject( const wxBitmap& bitmap );
     virtual void SelectObject( const wxBitmap& bitmap );

-    void GetSize( int *width, int *height ) const;
-
-  private: 
-    friend wxPaintDC;
+    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;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)

 };
 
 #endif
 };
 
 #endif