Default to wxConvUTF8 (not wxConvAuto) in wxDataInputStream and wxDataOutputStream...

[wxWidgets.git] / interface / wx / clntdata.h

diff --git a/interface/wx/clntdata.h b/interface/wx/clntdata.h
index 62d7a864297a449a4c6629ec919534a970bf8439..dea129e018fa62bd394679b25d92cb5732219c22 100644 (file)
--- a/interface/wx/clntdata.h
+++ b/interface/wx/clntdata.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxClientDataContainer
-    @wxheader{clntdata.h}
 
     This class is a mixin that provides storage and management of "client
     data." This data can either be of type void - in which case the data
@@ -36,7 +35,7 @@ public:
     /**
         Destructor.
     */
-    ~wxClientDataContainer();
+    virtual ~wxClientDataContainer();
 
     /**
         Get the untyped client data.
@@ -63,7 +62,6 @@ public:
 
 /**
     @class wxClientData
-    @wxheader{clntdata.h}
 
     All classes deriving from wxEvtHandler (such as all controls and wxApp) can
     hold arbitrary data which is here referred to as "client data". This is
@@ -101,14 +99,13 @@ public:
     /**
         Virtual destructor.
     */
-    ~wxClientData();
+    virtual ~wxClientData();
 };
 
 
 
 /**
     @class wxStringClientData
-    @wxheader{clntdata.h}
 
     Predefined client data class for holding a string.
 
@@ -131,7 +128,7 @@ public:
     /**
         Get string client data.
     */
-    const wxString GetData() const;
+    const wxString& GetData() const;
 
     /**
         Set string client data.