From 9f06bcb3b8aea7aa709754a217c26e94fe2d5954 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 24 Apr 1999 08:50:40 +0000 Subject: [PATCH] minimal now works in Unicode mode git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/minimal/minimal.cpp | 6 +++--- src/common/event.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 978db2a254..9e0758f642 100644 --- 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 904178bc7b..6a44755477 100644 --- 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; }