made wxNativePixelFormat usable under Mac

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

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index ca991709e034344382b2215d8939c95da21c06af..71b4812e7901c4424151bd31cce2fe8b49380fc8 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        encconv.h
+// Name:        wx/encconv.h

 // Purpose:     wxEncodingConverter class for converting between different
 //              font encodings
 // Author:      Vaclav Slavik
 // Purpose:     wxEncodingConverter class for converting between different
 //              font encodings
 // Author:      Vaclav Slavik


@@ -7,26 +7,34 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __ENCCONV_H__
-#define __ENCCONV_H__
+#ifndef _WX_ENCCONV_H_
+#define _WX_ENCCONV_H_

 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "encconv.h"
 #endif
 
 #include "wx/defs.h"
 #pragma interface "encconv.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/font.h"
-#include "wx/dynarray.h"

 
 

+#if wxUSE_FONTMAP
+
+#include "wx/object.h"
+#include "wx/fontenc.h"
+#include "wx/dynarray.h"

 
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------

 
 

-enum {
+enum
+{

     wxCONVERT_STRICT,
     wxCONVERT_SUBSTITUTE
 };
 
 
     wxCONVERT_STRICT,
     wxCONVERT_SUBSTITUTE
 };
 
 

-enum {
+enum
+{

     wxPLATFORM_CURRENT = -1,
 
     wxPLATFORM_UNIX = 0,
     wxPLATFORM_CURRENT = -1,
 
     wxPLATFORM_UNIX = 0,


@@ -35,8 +43,11 @@ enum {
     wxPLATFORM_MAC
 };
 
     wxPLATFORM_MAC
 };
 

-WX_DEFINE_ARRAY(wxFontEncoding, wxFontEncodingArray);
+// ----------------------------------------------------------------------------
+// types
+// ----------------------------------------------------------------------------

 
 

+WX_DEFINE_ARRAY_INT(wxFontEncoding, wxFontEncodingArray);

 
 //--------------------------------------------------------------------------------
 // wxEncodingConverter
 
 //--------------------------------------------------------------------------------
 // wxEncodingConverter


@@ -51,8 +62,8 @@ class WXDLLEXPORT wxEncodingConverter : public wxObject
             wxEncodingConverter();
             ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
 
             wxEncodingConverter();
             ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
 

-            // Initialize convertion. Both output or input encoding may
-            // be wxFONTENCODING_UNICODE, but only if wxUSE_UNICODE 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.

             //
             // All subsequent calls to Convert() will interpret it's argument
             // as a string in input_enc encoding and will output string in
             //
             // All subsequent calls to Convert() will interpret it's argument
             // as a string in input_enc encoding and will output string in


@@ -82,15 +93,15 @@ class WXDLLEXPORT 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 wxChar* input, wxChar* output);
-            void Convert(wxChar* str) { Convert(str, str); }
-            wxString Convert(const wxString& input);
-
-#if wxUSE_UNICODE // otherwise wxChar === char
-            void Convert(const char* input, wxChar* output);
-            void Convert(const wxChar* input, char* output);

             void Convert(const char* input, char* output);
             void Convert(char* str) { Convert(str, str); }
             void Convert(const char* input, char* output);
             void Convert(char* str) { Convert(str, str); }

+            wxString Convert(const wxString& input);
+
+#if wxUSE_WCHAR_T
+            void Convert(const char* input, wchar_t* output);
+            void Convert(const wchar_t* input, char* output);
+            void Convert(const wchar_t* input, wchar_t* output);
+            void Convert(wchar_t* str) { 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


@@ -129,28 +140,17 @@ class WXDLLEXPORT wxEncodingConverter : public wxObject
 
     private:
 
 
     private:
 

-            wxChar *m_Table;
+#if wxUSE_WCHAR_T
+            wchar_t *m_Table;
+#else
+            char *m_Table;
+#endif

             bool m_UnicodeInput, m_UnicodeOutput;
             bool m_JustCopy;
 
             bool m_UnicodeInput, m_UnicodeOutput;
             bool m_JustCopy;
 

+    DECLARE_NO_COPY_CLASS(wxEncodingConverter)

 };
 
 };
 

+#endif // wxUSE_FONTMAP

 
 

-#endif  // __ENCCONV_H__
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif  // _WX_ENCCONV_H_