Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/sstream.h b/interface/wx/sstream.h
index 06d309ab06c1abfb9c9b33cca7e4147cb347870a..609f19949b17c90ea68766d4147b6cad8c99d7ec 100644 (file)
--- a/interface/wx/sstream.h
+++ b/interface/wx/sstream.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxStringInputStream
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxStringInputStream
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -63,7 +63,7 @@ public:
         with default value of this argument the data written to the stream must
         be valid UTF-8, pass @c wxConvISO8859_1 to deal with arbitrary 8 bit data.
     */
         with default value of this argument the data written to the stream must
         be valid UTF-8, pass @c wxConvISO8859_1 to deal with arbitrary 8 bit data.
     */

-    wxStringOutputStream(wxString str = NULL, wxMBConv& conv = wxConvUTF8);
+    wxStringOutputStream(wxString* pString = 0, wxMBConv& conv = wxConvUTF8);

 
     /**
         Returns the string containing all the data written to the stream so far.
 
     /**
         Returns the string containing all the data written to the stream so far.