Added wxTE_PROCESS_TAB

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

diff --git a/include/wx/gtk1/dataobj.h b/include/wx/gtk1/dataobj.h
index 8128475f1b59e3abc7e7ab290ec7ec4011eff714..1be5b043ddde3ba290d5bed551d37bab97cfe454 100644 (file)
--- a/include/wx/gtk1/dataobj.h
+++ b/include/wx/gtk1/dataobj.h
@@ -69,7 +69,7 @@ public:
   void SetText( const wxString& strText) 
     { m_strText = strText; }
     
-  wxString GetText() 
+  wxString GetText() const
     { return m_strText; }
 
 private:
@@ -95,7 +95,7 @@ public:
   void AddFile( const wxString &file )
     { m_files += file; m_files += (char)0; }
     
-  wxString GetFiles()
+  wxString GetFiles() const
     { return m_files; }
     
 private:
@@ -115,13 +115,15 @@ public:
 
   wxBitmapDataObject(void) {}
   
+  wxBitmapDataObject( const wxBitmap& bitmap ) { m_bitmap = bitmap; }
+  
   virtual wxDataFormat GetFormat() const
     { return wxDF_BITMAP; }
     
   void SetBitmap( const wxBitmap &bitmap )
     { m_bitmap = bitmap; }
     
-  wxBitmap GetBitmap()
+  wxBitmap GetBitmap() const
     { return m_bitmap; }
     
 private:
@@ -138,11 +140,9 @@ class wxPrivateDataObject : public wxDataObject
 
 public:
 
-  wxPrivateDataObject() 
-    { m_size = 0; m_data = (char*) NULL; }
+  wxPrivateDataObject();
     
-  ~wxPrivateDataObject()
-    { if (m_data) delete[] m_data; }
+  ~wxPrivateDataObject();
   
   virtual wxDataFormat GetFormat() const
     { return wxDF_PRIVATE; }
@@ -154,16 +154,16 @@ public:
   void SetId( const wxString& id )
     { m_id = id; }
     
-  wxString GetId()
+  wxString GetId() const
     { return m_id; }
 
   // will make internal copy
   void SetData( const char *data, size_t size );
     
-  size_t GetDataSize()
+  size_t GetDataSize() const
     { return m_size; }
     
-  char* GetData()
+  char* GetData() const
     { return m_data; }
     
 private: