Remove string conversion functions and use the wx provided ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 541903645014d6e17fdbba3fc7b1ca794af2ee0f..4bfb7ece07bfcc808e2353d62d7b672b17ec2a2a 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -28,6 +28,7 @@
 #include "wx/cocoa/autorelease.h"
 #else
 #include "wx/osx/private.h"
 #include "wx/cocoa/autorelease.h"
 #else
 #include "wx/osx/private.h"

+#include "wx/cocoa/string.h"

 
 #include <WebKit/WebKit.h>
 #include <WebKit/HIWebView.h>
 
 #include <WebKit/WebKit.h>
 #include <WebKit/HIWebView.h>


@@ -302,28 +303,6 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
 
 #endif
 
 
 #endif
 

-//---------------------------------------------------------
-// helper functions for NSString<->wxString conversion
-//---------------------------------------------------------
-
-inline wxString wxStringWithNSString(NSString *nsstring)
-{
-#if wxUSE_UNICODE
-    return wxString([nsstring UTF8String], wxConvUTF8);
-#else
-    return wxString([nsstring lossyCString]);
-#endif // wxUSE_UNICODE
-}
-
-inline NSString* wxNSStringWithWxString(const wxString &wxstring)
-{
-#if wxUSE_UNICODE
-    return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)];
-#else
-    return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
-#endif // wxUSE_UNICODE
-}
-

 @interface MyFrameLoadMonitor : NSObject
 {
     wxWebViewWebKit* webKitWindow;
 @interface MyFrameLoadMonitor : NSObject
 {
     wxWebViewWebKit* webKitWindow;