reset fg/bg colour and font to default if set to wxNullColour/Font

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

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index 5bf29e747060d0b0efdebb6e17f678562dbb4a84..f950f634cbf78718fae4dc674e177535bc6a16bb 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
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

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

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


@@ -87,7 +87,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             //
             // Returns FALSE if given conversion is impossible, TRUE otherwise
             // (conversion may be impossible either if you try to convert
             //
             // 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);
 
             // or output encoding is not supported.)
             bool Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method = wxCONVERT_STRICT);
 


@@ -146,7 +146,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             // to convert in the other)
             static bool CanConvert(wxFontEncoding encIn, wxFontEncoding encOut)
             {
             // to convert in the other)
             static bool CanConvert(wxFontEncoding encIn, wxFontEncoding encOut)
             {

-                return GetAllEquivalents(encIn).Find(encOut) != wxNOT_FOUND;
+                return GetAllEquivalents(encIn).Index(encOut) != wxNOT_FOUND;

             }
 
     private:
             }
 
     private: