Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/palmos/dcmemory.h b/include/wx/palmos/dcmemory.h
index 9c125ff42f6c7e2546034bf3fac6e15031c3b6dd..59b69f98596b959ca57eb38e920cbc93f9fd79b8 100644 (file)
--- a/include/wx/palmos/dcmemory.h
+++ b/include/wx/palmos/dcmemory.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/dcmemory.h
 // Purpose:     wxMemoryDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/dcmemory.h
 // Purpose:     wxMemoryDC class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,33 +12,31 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcmemory.h"
-#endif
-
-#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+#include "wx/palmos/dc.h"

 
 

-class WXDLLEXPORT wxMemoryDC : public wxDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPalmDCImpl

 {
 public:
 {
 public:

-    wxMemoryDC();
-    wxMemoryDC(wxDC *dc); // Create compatible DC
-
-    virtual void SelectObject(const wxBitmap& bitmap);
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); // Create compatible DC

 
 

-protected:

     // override some base class virtuals
     // override some base class virtuals

-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

     virtual void DoGetSize(int* width, int* height) const;
     virtual void DoGetSize(int* width, int* height) const;

+    virtual void DoSelect(const wxBitmap& bitmap);
+
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const;

 
 

+protected:

     // create DC compatible with the given one or screen if dc == NULL
     bool CreateCompatible(wxDC *dc);
 
     // initialize the newly created DC
     void Init();
 
     // create DC compatible with the given one or screen if dc == NULL
     bool CreateCompatible(wxDC *dc);
 
     // initialize the newly created DC
     void Init();
 

-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMemoryDC)
+    DECLARE_CLASS(wxMemoryDCImpl)
+    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)

 };
 
 #endif
 };
 
 #endif