fix WinCE compilation after tbar95.h ->t oolbar.h renaming (#10197)

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 6edc56692556a04eae939b7c7e4eeaab6afb0dfd..2ef13d624775a005e372cca8163d7c7d30663117 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -1,40 +1,45 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.h
-// Purpose:     wxMemoryDC class
+// Name:        wx/motif/dcmemory.h
+// Purpose:     wxMemoryDCImpl class

 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#ifdef __GNUG__
-#pragma interface "dcmemory.h"
-#endif
-
-#include "wx/dcclient.h"
+#include "wx/motif/dcclient.h"

 
 

-class WXDLLEXPORT wxMemoryDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+public:
+    wxMemoryDCImpl(wxMemoryDC *owner) : wxWindowDCImpl(owner) { Init(); }
+    wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+        : wxWindowDCImpl(owner)
+    {
+        Init();
+        DoSelect(bitmap);
+    }
+
+    wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc);
+    virtual ~wxMemoryDCImpl();
+
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+private:
+    friend class wxPaintDC;

 
 

-  public:
-    wxMemoryDC(void);
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height ) const;
+    void Init();

 
 

-    inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
+    wxBitmap m_bitmap;

 
 

-  private: 
-    friend wxPaintDC;
-    wxBitmap  m_bitmap;
+    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)

 };
 
 #endif
 };
 
 #endif

-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_