allow setting empty tooltip in SetIcon() (patch 1750994)

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index c576655b05d3442eb756ef8d3bf4fbf13ea8e656..6cce52c26bfa0601f763e75417e8f9a96c46fb80 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -1,38 +1,43 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.h
+// Name:        wx/motif/dcmemory.h
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
-#pragma interface "dcmemory.h"
-#endif
-
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
-  public:
-    wxMemoryDC(void);
+public:
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
     wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height ) const;
+    virtual ~wxMemoryDC();
+
+    void DoGetSize( int *width, int *height ) const;
+
+    wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
+
+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+private:
+    friend class wxPaintDC;
+
+    void Init();
 
-  private: 
-    friend wxPaintDC;
-    wxBitmap  m_selected;
+    wxBitmap  m_bitmap;
 };
 
 #endif
-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_