Add missing WXK constants for the control keys

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

diff --git a/src/dfb/dcmemory.cpp b/src/dfb/dcmemory.cpp
index 036fcb81e108287e965a9c9f3fcdf4877386c071..8929ca41ce5501fb559dce2e8165998431937f68 100644 (file)
--- a/src/dfb/dcmemory.cpp
+++ b/src/dfb/dcmemory.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/dfb/dcmemory.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/dfb/dcmemory.cpp

-// Purpose:     wxMemoryDC implementation
+// Purpose:     wxMemoryDCImpl implementation

 // Author:      Vaclav Slavik
 // Created:     2006-08-16
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2006-08-16
 // RCS-ID:      $Id$


@@ -19,12 +19,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dcmemory.h"
-

 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
 #endif
 

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

 #include "wx/dfb/private.h"
 
 // ===========================================================================
 #include "wx/dfb/private.h"
 
 // ===========================================================================


@@ -32,28 +32,40 @@
 // ===========================================================================
 
 //-----------------------------------------------------------------------------
 // ===========================================================================
 
 //-----------------------------------------------------------------------------

-// wxMemoryDC
+// wxMemoryDCImpl

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

-#warning "FIXME: verify/fix that wxMemoryDC works correctly with mono bitmaps"
+#warning "FIXME: verify/fix that wxMemoryDCImpl works correctly with mono bitmaps"

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxDFBDCImpl)
+
+void wxMemoryDCImpl::Init()
+{
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner)
+              : wxDFBDCImpl(owner)
+{
+    Init();
+}

 
 

-wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+              : wxDFBDCImpl(owner)

 {
 {

-    if ( bitmap.IsOk() )
-        SelectObject(bitmap);
+    Init();
+    DoSelect(bitmap);

 }
 
 }
 

-wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc))
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc))
+              : wxDFBDCImpl(owner)

 {
 }
 
 {
 }
 

-void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
+void wxMemoryDCImpl::DoSelect(const wxBitmap& bitmap)

 {
     m_bmp = bitmap;
 
 {
     m_bmp = bitmap;
 

-    if ( !bitmap.Ok() )
+    if ( !bitmap.IsOk() )

     {
         // select the bitmap out of the DC
         m_surface = NULL;
     {
         // select the bitmap out of the DC
         m_surface = NULL;


@@ -61,5 +73,5 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
     }
 
     // init the DC for drawing to this bitmap
     }
 
     // init the DC for drawing to this bitmap

-    Init(bitmap.GetDirectFBSurface());
+    DFBInit(bitmap.GetDirectFBSurface());

 }
 }