Fix wxComboCtrlBase::DoGetSizeFromTextSize() performance regression.

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index b71edda8e5ac56785da70d3f0bb3737996e3dd65..2f0b5a2f93af8d9c1bbdb7df6b867775d9ab5228 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -4,9 +4,8 @@
 // Author:      Julian Smart
 // Modified by:
 // 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".
@@ -25,8 +24,8 @@
 
 #include "typetest.h"
 
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
-#include "mondrian.xpm"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
 #endif
 
 #ifdef new
@@ -80,7 +79,7 @@ bool MyApp::OnInit()
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Give it an icon
-    frame->SetIcon(wxICON(mondrian));
+    frame->SetIcon(wxICON(sample));
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
@@ -116,8 +115,6 @@ bool MyApp::OnInit()
     // Show the frame
     frame->Show(true);
 
-    SetTopWindow(frame);
-
     return true;
 }
 
@@ -894,10 +891,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