Regenerated makefiles

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

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index abb8cb0cdbd0cc4a0d7ecb14c57242fc88a94ad3..6a54439eebf767a35339e2675b70a5273b288044 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -4,20 +4,14 @@
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ENCCONV_H_
 #define _WX_ENCCONV_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ENCCONV_H_
 #define _WX_ENCCONV_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "encconv.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

-#if wxUSE_FONTMAP
-

 #include "wx/object.h"
 #include "wx/fontenc.h"
 #include "wx/dynarray.h"
 #include "wx/object.h"
 #include "wx/fontenc.h"
 #include "wx/dynarray.h"


@@ -60,7 +54,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
     public:
 
             wxEncodingConverter();
     public:
 
             wxEncodingConverter();

-            ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
+            virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }

 
             // Initialize conversion. Both output or input encoding may
             // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1.
 
             // Initialize conversion. Both output or input encoding may
             // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1.


@@ -85,7 +79,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             //     both modes gurantee that output string will have same length
             //     as input string
             //
             //     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 wxWidgets or if input
             // or output encoding is not supported.)
             // (conversion may be impossible either if you try to convert
             // to Unicode with non-Unicode build of wxWidgets or if input
             // or output encoding is not supported.)


@@ -93,15 +87,15 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
 
             // Convert input string according to settings passed to Init.
             // Note that you must call Init before using Convert!
 
             // 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
             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
 #endif
             // Return equivalent(s) for given font that are used
             // under given platform. wxPLATFORM_CURRENT means the plaform


@@ -162,6 +156,4 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
     DECLARE_NO_COPY_CLASS(wxEncodingConverter)
 };
 
     DECLARE_NO_COPY_CLASS(wxEncodingConverter)
 };
 

-#endif // wxUSE_FONTMAP
-

 #endif  // _WX_ENCCONV_H_
 #endif  // _WX_ENCCONV_H_