From 5ce5f94ea21e6ea670d16f4273881482a4807d10 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 9 Nov 2002 20:21:21 +0000 Subject: [PATCH] Compile fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/image/image.cpp | 6 +++--- samples/scroll/scroll.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 92e4e44c98..3f60d99734 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -285,9 +285,9 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, // try to find the directory with our images wxString dir; if ( wxFile::Exists(wxT("./horse.png")) ) - dir = "./"; + dir = wxT("./"); else if ( wxFile::Exists(wxT("../horse.png")) ) - dir = "../"; + dir = wxT("../"); else wxLogWarning(wxT("Can't find image files in either '.' or '..'!")); @@ -322,7 +322,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, #if wxUSE_GIF image.Destroy(); - if ( !image.LoadFile( dir + wxString("horse.gif"))) + if ( !image.LoadFile( dir + _T("horse.gif" )) ) wxLogError(wxT("Can't load GIF image")); else my_horse_gif = new wxBitmap( image ); diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp index 5c5e2b2772..790c8eaa4a 100644 --- a/samples/scroll/scroll.cpp +++ b/samples/scroll/scroll.cpp @@ -313,7 +313,7 @@ void MyCanvas::OnQueryPosition( wxCommandEvent &WXUNUSED(event) ) void MyCanvas::OnAddButton( wxCommandEvent &WXUNUSED(event) ) { wxLogMessage( wxT("Inserting button at position 10,70...") ); - wxButton *button = new wxButton( this, ID_NEWBUTTON, "new button", wxPoint(10,70), wxSize(80,25) ); + wxButton *button = new wxButton( this, ID_NEWBUTTON, wxT("new button"), wxPoint(10,70), wxSize(80,25) ); wxPoint pt( button->GetPosition() ); wxLogMessage( wxT("-> Position after inserting %d %d"), pt.x, pt.y ); }