Unicode compilation fixes.

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

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index 0c571dd95b30cfec628f03f9e2a172dd81315a28..e9a05fe408a9924abf550e3f0865a8bd09a1ddb0 100644 (file)
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -120,7 +120,7 @@ struct WXDLLEXPORT wxThemeInfo
     bool wxThemeUse##themename = TRUE;                                      \
     wxTheme *wxCtorFor##themename() { return new classname; }               \
     wxThemeInfo classname::ms_info##themename(wxCtorFor##themename,         \
     bool wxThemeUse##themename = TRUE;                                      \
     wxTheme *wxCtorFor##themename() { return new classname; }               \
     wxThemeInfo classname::ms_info##themename(wxCtorFor##themename,         \

-                                              #themename, themedesc)
+                                              wxT( #themename ), themedesc)

 
 #endif // _WX_UNIV_THEME_H_
 
 
 #endif // _WX_UNIV_THEME_H_
 

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index 8de443a243dcd05e9d3408b8e25bdee058f1f61a..ec408ee30ed67b4c1b586a4dea06ed9c00485482 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -92,7 +92,7 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons
         break;
     default:
         // we CAN'T get here
         break;
     default:
         // we CAN'T get here

-        wxFAIL_MSG( "wxBestHelpController: Must call Initialize, first!" );
+        wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") );

         return wxEmptyString;
         break;
     }
         return wxEmptyString;
         break;
     }