Add files necessary to run Expat configure.

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

diff --git a/interface/wx/clntdata.h b/interface/wx/clntdata.h
index 62d7a864297a449a4c6629ec919534a970bf8439..44f8de01bf1b4d2676d1876e985d60577efc36ca 100644 (file)
--- a/interface/wx/clntdata.h
+++ b/interface/wx/clntdata.h
@@ -3,15 +3,14 @@
 // Purpose:     interface of wxClientData[Container] and wxStringClientData
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxClientData[Container] and wxStringClientData
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxClientDataContainer
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @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
+    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

     @e container does not take care of freeing the data again or it is of
     type wxClientData or its derivatives. In that case the container will free
     the memory itself later. Note that you @e must not assign both void data
     @e container does not take care of freeing the data again or it is of
     type wxClientData or its derivatives. In that case the container will free
     the memory itself later. Note that you @e must not assign both void data


@@ -36,7 +35,7 @@ public:
     /**
         Destructor.
     */
     /**
         Destructor.
     */

-    ~wxClientDataContainer();
+    virtual ~wxClientDataContainer();

 
     /**
         Get the untyped client data.
 
     /**
         Get the untyped client data.


@@ -63,7 +62,6 @@ public:
 
 /**
     @class wxClientData
 
 /**
     @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
 
     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.
     */
     /**
         Virtual destructor.
     */

-    ~wxClientData();
+    virtual ~wxClientData();

 };
 
 
 
 /**
     @class wxStringClientData
 };
 
 
 
 /**
     @class wxStringClientData

-    @wxheader{clntdata.h}

 
     Predefined client data class for holding a string.
 
 
     Predefined client data class for holding a string.
 


@@ -131,7 +128,7 @@ public:
     /**
         Get string client data.
     */
     /**
         Get string client data.
     */

-    const wxString GetData() const;
+    const wxString& GetData() const;

 
     /**
         Set string client data.
 
     /**
         Set string client data.