Mac compilation fix after last commit

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index ed3d44486826dda218c9abd1571fad5dc3406114..7f39682ee003c49ab616157118f517a20cc7b867 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -2504,8 +2504,6 @@ public:
 
     virtual wxMBConv *Clone() const { return new wxMBConv_cocoa(*this); }
 
 
     virtual wxMBConv *Clone() const { return new wxMBConv_cocoa(*this); }
 

-    bool IsOk() const
-

     bool IsOk() const
     {
         return m_encoding != kCFStringEncodingInvalidId &&
     bool IsOk() const
     {
         return m_encoding != kCFStringEncodingInvalidId &&


@@ -2669,9 +2667,8 @@ public:
         return res ;
     }
 
         return res ;
     }
 

-    virtual wxMBConv *Clone() const { return wxMBConv_mac(*this); }
+    virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); }

 
 

-    bool IsOk() const

     bool IsOk() const
         { return m_MB2WC_converter !=  NULL && m_WC2MB_converter != NULL  ; }
 
     bool IsOk() const
         { return m_MB2WC_converter !=  NULL && m_WC2MB_converter != NULL  ; }