Unicode compilation fixes (patch 747793)

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

diff --git a/contrib/include/wx/fl/frmview.h b/contrib/include/wx/fl/frmview.h
index d5b35235b9669f079b11885514a73523ae115186..db9868c916d044133e7153585412e8ba84025caa 100644 (file)
--- a/contrib/include/wx/fl/frmview.h
+++ b/contrib/include/wx/fl/frmview.h
@@ -114,7 +114,8 @@ public:
 
     // if file name is empty, views are are not saved/loaded
 
-    virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" );
+    virtual void Init( wxWindow* pMainFrame,
+                       const wxString& settingsFile = wxEmptyString );
 
     // synonyms
     wxFrame* GetParentFrame();

diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp
index 163b5fedee99a991cb830db46639493add0b45b3..dcd98c5f9f929079af0f1730b4a4e1a373078dee 100644 (file)
--- a/contrib/src/fl/frmview.cpp
+++ b/contrib/src/fl/frmview.cpp
@@ -311,7 +311,7 @@ void wxFrameManager::AddView( wxFrameView* pFrmView )
 void wxFrameManager::RemoveView( wxFrameView* pFrmView )
 {
     // TBD::
-    wxFAIL_MSG("wxFrameManager::RemoveView() has not been implemented yet.");
+    wxFAIL_MSG( _T("wxFrameManager::RemoveView() has not been implemented yet.") );
 }
 
 int wxFrameManager::GetActiveViewNo()