Compilation fix for r74440 and STL builds.

[wxWidgets.git] / src / common / encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index a4b7143ff38981b27ec237acda1f7e03ac77e72d..e666b9f245ba2e33bcf05bafa4c229a7581e59a1 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        encconv.cpp
+// Name:        src/common/encconv.cpp
 // Purpose:     wxEncodingConverter class for converting between different
 //              font encodings
 // Author:      Vaclav Slavik
@@ -116,7 +116,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
     const wxUint16 *in_tbl;
     const wxUint16 *out_tbl = NULL;
 
-    if (m_Table) {delete[] m_Table; m_Table = NULL;}
+    wxDELETEA(m_Table);
 
     if (input_enc == output_enc) {m_JustCopy = true; return true;}
 
@@ -444,7 +444,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
 {
     if (platform == wxPLATFORM_CURRENT)
     {
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
         platform = wxPLATFORM_WINDOWS;
 #elif defined(__WXGTK__) || defined(__WXMOTIF__)
         platform = wxPLATFORM_UNIX;