wxPuts() should output a trailing newline even in Unix/Unicode builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index ad81c9d99e4db595985dc092ca06a934512ba1d4..18c3a3426cf1ab770d62f7f76a096295b0b5baf0 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -199,6 +199,13 @@ versions, please update your code to not use them.
 OTHER CHANGES
 =============
 
 OTHER CHANGES
 =============
 

+2.5.4
+-----
+
+Unix:
+
+- wxPuts() now correctly outputs trailing new line in Unicode build
+

 2.5.3
 -----
 
 2.5.3
 -----
 

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index a5a03e38a096b3dd20f9c0cbdcc3398ddd4384f7..cd87652f6dd1547c6f220d02fd60828f1e2ae7da 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -393,9 +393,11 @@
         #define wxNEED_UNGETC
 
         #define wxNEED_FPUTS
         #define wxNEED_UNGETC
 
         #define wxNEED_FPUTS

+        #define wxNEED_PUTS

         #define wxNEED_PUTC
  
         int wxFputs(const wxChar *ch, FILE *stream);
         #define wxNEED_PUTC
  
         int wxFputs(const wxChar *ch, FILE *stream);

+        int wxPuts(const wxChar *ws);

         int wxPutc(wxChar ch, FILE *stream);
         
         #ifdef __cplusplus
         int wxPutc(wxChar ch, FILE *stream);
         
         #ifdef __cplusplus


@@ -407,7 +409,6 @@
         #endif
 
         #define wxPutchar(wch) wxPutc(wch, stdout)
         #endif
 
         #define wxPutchar(wch) wxPutc(wch, stdout)

-        #define wxPuts(ws) wxFputs(ws, stdout)

             
         #define wxNEED_PRINTF_CONVERSION
         #define wxNEED_WX_STDIO_H
             
         #define wxNEED_PRINTF_CONVERSION
         #define wxNEED_WX_STDIO_H


@@ -498,7 +499,8 @@
             #ifdef HAVE_PUTWS
                 #define wxPuts      putws
             #else
             #ifdef HAVE_PUTWS
                 #define wxPuts      putws
             #else

-                #define wxPuts(ws) wxFputs(ws, stdout)
+                #define wxNEED_PUTS
+                int wxPuts(const wxChar *ws)

             #endif
 
             /* we need %s to %ls conversion for printf and scanf etc */
             #endif
 
             /* we need %s to %ls conversion for printf and scanf etc */

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 1b861219294c7e7ef90fa7375a880df9f7dbc0fc..9f12a7b58274f930b3dd5f53759978b7c3171ee5 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -613,6 +613,22 @@ int wxFputs(const wchar_t *ws, FILE *stream)
 }
 #endif // wxNEED_FPUTS
 
 }
 #endif // wxNEED_FPUTS
 

+#ifdef wxNEED_PUTS
+int wxPuts(const wxChar *ws)
+{
+    int rc = wxFputs(ws, stdout);
+    if ( rc != -1 )
+    {
+        if ( wxFputs(L"\n", stdout) == -1 )
+            return -1;
+
+        rc++;
+    }
+
+    return rc;
+}
+#endif // wxNEED_PUTS
+

 #ifdef wxNEED_PUTC
 int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
 {
 #ifdef wxNEED_PUTC
 int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
 {