OnEnter/OnDragOver API update (compiles, links, somewhat runs under wxGTK)

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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 572b4f12d216eb7cc9b04824e379b23d83db45ef..aa49135e6a902e634aa11093f4b58505c265aa23 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -331,7 +331,7 @@ public:
     virtual wxBitmap GetBitmap() const { return m_bitmap; }
     virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
 
     virtual wxBitmap GetBitmap() const { return m_bitmap; }
     virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
 

-private:
+protected:

     wxBitmap m_bitmap;
 };
 
     wxBitmap m_bitmap;
 };
 


@@ -349,7 +349,7 @@ public:
     wxFileDataObjectBase() : wxDataObjectSimple(wxDF_FILENAME) { }
 
     // get a reference to our array
     wxFileDataObjectBase() : wxDataObjectSimple(wxDF_FILENAME) { }
 
     // get a reference to our array

-    const wxArrayString& GetFilenames() { return m_filenames; }
+    const wxArrayString& GetFilenames() const { return m_filenames; }

 
     // the Get() functions do nothing for us
     virtual size_t GetDataSize() const { return 0; }
 
     // the Get() functions do nothing for us
     virtual size_t GetDataSize() const { return 0; }