X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/526954c5968baa29218c994ec48e476ae2bd4b9f..f155075229d771430f0793700f5048ad4be00e9d:/samples/typetest/typetest.cpp diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index c5d6574ea4..0f3a339c0b 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -25,7 +25,7 @@ #include "typetest.h" -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -116,8 +116,6 @@ bool MyApp::OnInit() // Show the frame frame->Show(true); - SetTopWindow(frame); - return true; } @@ -894,10 +892,10 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event)) printf( "\n\nConversion with wxConvLocal:\n" ); wxConvCurrent = &wxConvLocal; - printf( (const char*) str.mbc_str() ); + puts( str.mbc_str() ); printf( "\n\nConversion with wxConvLibc:\n" ); wxConvCurrent = &wxConvLibc; - printf( (const char*) str.mbc_str() ); + puts( str.mbc_str() ); } #endif