Fix typo in last commit

[wxWidgets.git] / src / palmos / dcmemory.cpp

diff --git a/src/palmos/dcmemory.cpp b/src/palmos/dcmemory.cpp
index 96487eba36b0831a7db43ad2ee2421c8c2fe7484..13bf45b0c22b21d7b1a25749a8fbc2b1c4695ec3 100644 (file)
--- a/src/palmos/dcmemory.cpp
+++ b/src/palmos/dcmemory.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/dcmemory.h"
 #endif
 
 #include "wx/dcmemory.h"

+#include "wx/palmos/dcmemory.h"

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -32,61 +33,61 @@
 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// wxWin macros
+// wxMemoryDCImpl

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPalmDCImpl)

 
 

-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxMemoryDC
-// ----------------------------------------------------------------------------
-
-wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+        : wxPalmDCImpl( owner )

 {
 {

-    if ( bitmap.IsOk() )
-        SelectObject(bitmap);
+    CreateCompatible(NULL);
+    Init();

 }
 
 }
 

-wxMemoryDC::wxMemoryDC(wxDC *dc)
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+        : wxPalmDCImpl( owner )

 {
 {

+    CreateCompatible(NULL);
+    Init();
+    DoSelect(bitmap);

 }
 
 }
 

-void wxMemoryDC::Init()
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc )
+        : wxPalmDCImpl( owner )

 {
 {

+    wxCHECK_RET( dc, wxT("NULL dc in wxMemoryDC ctor") );
+
+    CreateCompatible(dc);
+
+    Init();

 }
 
 }
 

-bool wxMemoryDC::CreateCompatible(wxDC *dc)
+void wxMemoryDCImpl::Init()

 {
 {

-    return false;

 }
 
 }
 

-void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
+bool wxMemoryDCImpl::CreateCompatible(wxDC *dc)

 {
 {

+    wxDCImpl *impl = dc ? dc->GetImpl() : NULL ;
+    wxPalmDCImpl *msw_impl = wxDynamicCast( impl, wxPalmDCImpl );
+    if ( dc && !msw_impl)
+    {
+        m_ok = false;
+        return false;
+    }
+
+    return false;

 }
 
 }
 

-void wxMemoryDC::DoGetSize(int *width, int *height) const
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
 }
 
 {
 }
 

-// the rest of this file deals with drawing rectangles workaround, disabled by
-// default
-
-#define wxUSE_MEMORY_DC_DRAW_RECTANGLE 0
-
-#if wxUSE_MEMORY_DC_DRAW_RECTANGLE
-
-// For some reason, drawing a rectangle on a memory DC has problems.
-// Use this substitute if we can.
-static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxMemoryDCImpl::DoGetSize(int *width, int *height) const

 {
 }
 
 {
 }
 

-#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE
-
-void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect* subrect) const

 {
 }
 {
 }