applied patch #931719: "ESC closes dialog instead of combobox dropdown" (closes patch...

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

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index 66cf85bfc021c92a9490c32df74a924236da27a5..8658a250eb024a4133c53c5ef5e7e820b06e0885 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -2,17 +2,16 @@
 // Name:        dcmemory.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -29,19 +28,30 @@ class wxMemoryDC;
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class wxMemoryDC : public wxWindowDC
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
-    wxMemoryDC(void);
+public:
+    wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC(void);
+    ~wxMemoryDC();
     virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height );
-
-  private: 
+    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