move virtual GetPath() implementation out of line to work around an apparent Fedora...

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 7f5ee6c2a5b51a7b8373a95803b9a0f06412dfac..0061aa770c524c6a0a70689ba21d3d0686bd0eed 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -36,10 +36,6 @@ class WXDLLIMPEXP_FWD_BASE wxString;
 // the error value returned by wxMBConv methods
 #define wxCONV_FAILED ((size_t)-1)
 
 // the error value returned by wxMBConv methods
 #define wxCONV_FAILED ((size_t)-1)
 

-// the default value for some length parameters meaning that the string is
-// NUL-terminated
-#define wxNO_LEN ((size_t)-1)
-

 // ----------------------------------------------------------------------------
 // wxMBConv (abstract base class for conversions)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMBConv (abstract base class for conversions)
 // ----------------------------------------------------------------------------


@@ -240,7 +236,7 @@ private:
     // the conversion object we forward to
     wxMBConv *m_conv;
 
     // the conversion object we forward to
     wxMBConv *m_conv;
 

-    DECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames)
+    wxDECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames);

 };
 
 #endif // __UNIX__
 };
 
 #endif // __UNIX__


@@ -279,7 +275,7 @@ private:
     // the current decoder state: this is only used by ToWChar() if srcLen
     // parameter is not wxNO_LEN, when working on the entire NUL-terminated
     // strings we neither update nor use the state
     // the current decoder state: this is only used by ToWChar() if srcLen
     // parameter is not wxNO_LEN, when working on the entire NUL-terminated
     // strings we neither update nor use the state

-    class DecoderState : StateMode
+    class DecoderState : private StateMode

     {
     private:
         // current state: this one is private as we want to enforce the use of
     {
     private:
         // current state: this one is private as we want to enforce the use of


@@ -311,7 +307,7 @@ private:
 
     // encoder state is simpler as we always receive entire Unicode characters
     // on input
 
     // encoder state is simpler as we always receive entire Unicode characters
     // on input

-    class EncoderState : StateMode
+    class EncoderState : private StateMode

     {
     private:
         Mode mode;
     {
     private:
         Mode mode;


@@ -513,7 +509,7 @@ public:
 
     void Clear();
 
 
     void Clear();
 

-    // return true if the conversion could be initilized successfully
+    // return true if the conversion could be initialized successfully

     bool IsOk() const;
 
 private:
     bool IsOk() const;
 
 private:


@@ -527,13 +523,19 @@ private:
     wxMBConv *DoCreate() const;
 
     // set the name (may be only called when m_name == NULL), makes copy of
     wxMBConv *DoCreate() const;
 
     // set the name (may be only called when m_name == NULL), makes copy of

-    // charset string
+    // the charset string

     void SetName(const char *charset);
 
 
     void SetName(const char *charset);
 
 

+    // m_name may be NULL in which case m_encoding should be used
+    //

     // note that we can't use wxString here because of compilation
     // dependencies: we're included from wx/string.h
     char *m_name;
     // note that we can't use wxString here because of compilation
     // dependencies: we're included from wx/string.h
     char *m_name;

+
+    // may be wxFONTENCODING_SYSTEM in which case m_name is used
+    //
+    // if m_name is NULL, then we should use the default system encoding

     wxFontEncoding m_encoding;
 
     // use CreateConvIfNeeded() before accessing m_convReal!
     wxFontEncoding m_encoding;
 
     // use CreateConvIfNeeded() before accessing m_convReal!


@@ -625,7 +627,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
     #define wxFNCONV(name) wxConvFileName->cWX2MB(name)
     #define wxFNSTRINGCAST wxMBSTRINGCAST
 #else
     #define wxFNCONV(name) wxConvFileName->cWX2MB(name)
     #define wxFNSTRINGCAST wxMBSTRINGCAST
 #else

-#if defined( __WXOSX__ ) && wxMBFILES
+#if defined( __WXOSX_OR_COCOA__ ) && wxMBFILES

     #define wxFNCONV(name) wxConvFileName->cWC2MB( wxConvLocal.cWX2WC(name) )
 #else
     #define wxFNCONV(name) name
     #define wxFNCONV(name) wxConvFileName->cWC2MB( wxConvLocal.cWX2WC(name) )
 #else
     #define wxFNCONV(name) name