minimal now works in Unicode mode

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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 978db2a25476b94343ae71715c8621575ade4ce3..9e0758f642adb2a9f7b6bdf83a5b8a6636bfaa73 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -179,10 +179,10 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf("This is the about dialog of minimal sample.\n"
-               "Welcome to %s"
+    msg.Printf( _T("This is the about dialog of minimal sample.\n")
+                _T("Welcome to %s")
 #ifdef wxBETA_NUMBER
-               " (beta %d)!"
+               _T(" (beta %d)!")
 #endif // wxBETA_NUMBER
                , wxVERSION_STRING
 #ifdef wxBETA_NUMBER

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 904178bc7b6445666a2d30d3c60c18c83d7e64ce..6a44755477880bed6407032142af750953d7aacb 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -118,7 +118,7 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
     m_extraLong = 0;
     m_commandInt = 0;
     m_id = theId;
-    m_commandString = (char *) NULL;
+    m_commandString = (wxChar *) NULL;
     m_isCommandEvent = TRUE;
 }