Compile fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -285,9 +285,9 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
|
|||||||
// try to find the directory with our images
|
// try to find the directory with our images
|
||||||
wxString dir;
|
wxString dir;
|
||||||
if ( wxFile::Exists(wxT("./horse.png")) )
|
if ( wxFile::Exists(wxT("./horse.png")) )
|
||||||
dir = "./";
|
dir = wxT("./");
|
||||||
else if ( wxFile::Exists(wxT("../horse.png")) )
|
else if ( wxFile::Exists(wxT("../horse.png")) )
|
||||||
dir = "../";
|
dir = wxT("../");
|
||||||
else
|
else
|
||||||
wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
|
wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
|
||||||
|
|
||||||
@@ -322,7 +322,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
|
|||||||
#if wxUSE_GIF
|
#if wxUSE_GIF
|
||||||
image.Destroy();
|
image.Destroy();
|
||||||
|
|
||||||
if ( !image.LoadFile( dir + wxString("horse.gif")))
|
if ( !image.LoadFile( dir + _T("horse.gif" )) )
|
||||||
wxLogError(wxT("Can't load GIF image"));
|
wxLogError(wxT("Can't load GIF image"));
|
||||||
else
|
else
|
||||||
my_horse_gif = new wxBitmap( image );
|
my_horse_gif = new wxBitmap( image );
|
||||||
|
@@ -313,7 +313,7 @@ void MyCanvas::OnQueryPosition( wxCommandEvent &WXUNUSED(event) )
|
|||||||
void MyCanvas::OnAddButton( wxCommandEvent &WXUNUSED(event) )
|
void MyCanvas::OnAddButton( wxCommandEvent &WXUNUSED(event) )
|
||||||
{
|
{
|
||||||
wxLogMessage( wxT("Inserting button at position 10,70...") );
|
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() );
|
wxPoint pt( button->GetPosition() );
|
||||||
wxLogMessage( wxT("-> Position after inserting %d %d"), pt.x, pt.y );
|
wxLogMessage( wxT("-> Position after inserting %d %d"), pt.x, pt.y );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user