Fixed operator[] recursion

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

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index ea4a1f157100baf9ad95c456b0385006e46527a2..78b712ef4260f28e98dab3f023b0ed6c38d44832 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -11,7 +11,7 @@
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -28,20 +28,30 @@ class wxMemoryDC;
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class wxMemoryDC: public wxWindowDC
+class wxMemoryDC : public wxWindowDC
 {
-  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();
+    wxMemoryDC( wxDC *dc ); // Create compatible DC
+    ~wxMemoryDC();
+    virtual void SelectObject( const wxBitmap& bitmap );
+    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;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
 #endif