Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index 14845bb4797b03867054a28e0b68fd7a6fdd891f..318cf776b72aaaad99a4db839d0c7f2d9aeb3d40 100644 (file)
--- a/include/wx/sstream.h
+++ b/include/wx/sstream.h
@@ -66,9 +66,9 @@ public:
     wxStringOutputStream(wxString *pString = NULL,
                          wxMBConv& conv = wxConvUTF8)
         : m_conv(conv)
     wxStringOutputStream(wxString *pString = NULL,
                          wxMBConv& conv = wxConvUTF8)
         : m_conv(conv)

-#if wxUSE_UNICODE_WCHAR
+#if wxUSE_UNICODE

         , m_unconv(0)
         , m_unconv(0)

-#endif // wxUSE_UNICODE_WCHAR
+#endif // wxUSE_UNICODE

     {
         m_str = pString ? pString : &m_strInternal;
         m_pos = m_str->length() / sizeof(wxChar);
     {
         m_str = pString ? pString : &m_strInternal;
         m_pos = m_str->length() / sizeof(wxChar);


@@ -98,10 +98,10 @@ private:
     // arbitrary 8 bit data
     wxMBConv& m_conv;
 
     // arbitrary 8 bit data
     wxMBConv& m_conv;
 

-#if wxUSE_UNICODE_WCHAR
+#if wxUSE_UNICODE

     // unconverted data from the last call to OnSysWrite()
     wxMemoryBuffer m_unconv;
     // unconverted data from the last call to OnSysWrite()
     wxMemoryBuffer m_unconv;

-#endif // wxUSE_UNICODE_WCHAR
+#endif // wxUSE_UNICODE

 
     wxDECLARE_NO_COPY_CLASS(wxStringOutputStream);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxStringOutputStream);
 };