initialize m_initialized to false to avoid spurious asserts

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 8977d08f19ab32f8d27d338ab09db2f62d9bdb4f..6fbf324fbf9ed216acb5441068b3e66b19043279 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
-#ifdef __BORLANDC__
+#if defined( __BORLANDC__ ) || defined(__DARWIN__)
 #include "../common/unictabl.inc"
 #else
 #include "unictabl.inc"
@@ -44,9 +44,9 @@ typedef char tchar;
 
 #ifdef __WXMAC__
 
-#include "ATSUnicode.h"
-#include "TextCommon.h"
-#include "TextEncodingConverter.h"
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
 
 #include "wx/fontutil.h"
 #include "wx/mac/private.h"  // includes mac headers