ensure that GetEditControl() returns something even if label editing was started...

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

diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h
index e97091b2019a939ac7a3efd4448d0f0b2ad8ff90..c42c6544e7e11f8eef7df2d1dafbfe5f0747b896 100644 (file)
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -14,7 +14,7 @@
 
 #include "wx/mac/carbon/dcclient.h"
 
-class WXDLLEXPORT wxMemoryDCImpl: public wxPaintDCImpl
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
 {
 public:
     wxMemoryDCImpl( wxMemoryDC *owner );
@@ -23,18 +23,21 @@ public:
     
     virtual ~wxMemoryDCImpl();
 
-protected:
     virtual void DoGetSize( int *width, int *height ) const;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
        { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
     virtual void DoSelect(const wxBitmap& bitmap);
 
+    virtual const wxBitmap& GetSelectedBitmap() const
+        { return m_selected; }
+    virtual wxBitmap& GetSelectedBitmap()
+        { return m_selected; }
+    
 private:
     void Init();
 
     wxBitmap  m_selected;
     
-private:
     DECLARE_CLASS(wxMemoryDCImpl)
     DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
 };