don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index d99eaea5e2b34ba899920d8ddb3127f943960e2e..7d925b35516a93c443987bbeba998feb47546414 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -4,7 +4,7 @@
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ENCCONV_H_
@@ -16,8 +16,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_FONTMAP
-
 #include "wx/object.h"
 #include "wx/fontenc.h"
 #include "wx/dynarray.h"
@@ -85,23 +83,23 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             //     both modes gurantee that output string will have same length
             //     as input string
             //
-            // Returns FALSE if given conversion is impossible, TRUE otherwise
+            // Returns false if given conversion is impossible, true otherwise
             // (conversion may be impossible either if you try to convert
-            // to Unicode with non-Unicode build of wxWindows or if input
+            // to Unicode with non-Unicode build of wxWidgets or if input
             // or output encoding is not supported.)
             bool Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method = wxCONVERT_STRICT);
 
             // Convert input string according to settings passed to Init.
             // Note that you must call Init before using Convert!
-            void Convert(const char* input, char* output) const;
-            void Convert(char* str) const { Convert(str, str); }
+            bool Convert(const char* input, char* output) const;
+            bool Convert(char* str) const { return Convert(str, str); }
             wxString Convert(const wxString& input) const;
 
 #if wxUSE_WCHAR_T
-            void Convert(const char* input, wchar_t* output) const;
-            void Convert(const wchar_t* input, char* output) const;
-            void Convert(const wchar_t* input, wchar_t* output) const;
-            void Convert(wchar_t* str) const { Convert(str, str); }
+            bool Convert(const char* input, wchar_t* output) const;
+            bool Convert(const wchar_t* input, char* output) const;
+            bool Convert(const wchar_t* input, wchar_t* output) const;
+            bool Convert(wchar_t* str) const { return Convert(str, str); }
 #endif
             // Return equivalent(s) for given font that are used
             // under given platform. wxPLATFORM_CURRENT means the plaform
@@ -162,6 +160,4 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
     DECLARE_NO_COPY_CLASS(wxEncodingConverter)
 };
 
-#endif // wxUSE_FONTMAP
-
 #endif  // _WX_ENCCONV_H_