CanAcceptFocus() now returns true if either the window itself or one of its children...

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

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 55e6724e95946b413e3922f9e1c8916678dc88f7..4c76214c2a2fb877989f4061369ae8ec0fde42b1 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -12,13 +12,13 @@
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 

-#include "wx/defs.h"
+#include "wx/bitmap.h"

 
 // NOTE: different native implementations of wxMemoryDC will derive from
 //       different wxDC classes (wxPaintDC, wxWindowDC, etc), so that
 //       we cannot derive wxMemoryDCBase from wxDC and then use it as the
 //       only base class for native impl of wxMemoryDC...
 
 // NOTE: different native implementations of wxMemoryDC will derive from
 //       different wxDC classes (wxPaintDC, wxWindowDC, etc), so that
 //       we cannot derive wxMemoryDCBase from wxDC and then use it as the
 //       only base class for native impl of wxMemoryDC...

-class wxMemoryDCBase
+class WXDLLEXPORT wxMemoryDCBase

 {
 public:
     wxMemoryDCBase() { }
 {
 public:
     wxMemoryDCBase() { }


@@ -44,6 +44,7 @@ public:
         DoSelect(bmp);
     }
 
         DoSelect(bmp);
     }
 

+protected:

     virtual void DoSelect(const wxBitmap& bmp) = 0;
 };
 
     virtual void DoSelect(const wxBitmap& bmp) = 0;
 };