new rendering customization api fixes

[wxWidgets.git] / src / cocoa / app.mm

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 97ae62132a7537476f0b1b9b64e68c6adf149127..260c579d2eef830720f99e850652fb82480dfea3 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -23,11 +23,13 @@
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"
+    #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"
-    #include "wx/cocoa/ObjcPose.h"
 #endif
 
+#include "wx/cocoa/ObjcPose.h"
+
 #if wxUSE_WX_RESOURCES
 #  include "wx/resource.h"
 #endif
@@ -311,6 +313,7 @@ END_EVENT_TABLE()
     //  wxDebugContext::SetStream(NULL, NULL);
 #endif
 
+    wxDC::CocoaShutdownTextSystem();
 #if wxUSE_LOG
     // do it as the very last thing because everything else can log messages
     delete wxLog::SetActiveTarget(NULL);
@@ -352,6 +355,7 @@ bool wxApp::OnInitGui()
 
     // Create the app using the sharedApplication method
     m_cocoaApp = [NSApplication sharedApplication];
+    wxDC::CocoaInitializeTextSystem();
 //    [ m_cocoaApp setDelegate:m_cocoaApp ];
     #if 0
     wxLogDebug("Just for kicks");