Don't use GetThreadId() in wxMSW code.

[wxWidgets.git] / samples / typetest / typetest.cpp

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index e3a20a94f3b13365abaec823b33db6229c0b8a9d..0f3a339c0befd89683d3b73697dcb349cf228e8b 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -25,7 +25,7 @@
 
 #include "typetest.h"
 
 
 #include "typetest.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -116,8 +116,6 @@ bool MyApp::OnInit()
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 


@@ -894,10 +892,10 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
 
     printf( "\n\nConversion with wxConvLocal:\n" );
     wxConvCurrent = &wxConvLocal;
 
     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( "\n\nConversion with wxConvLibc:\n" );
     wxConvCurrent = &wxConvLibc;

-    printf( (const char*) str.mbc_str() );
+    puts( str.mbc_str() );

 
 }
 #endif
 
 }
 #endif