allow adjusting the combo button size (patch 1489452)

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 983961312d6be4a778f64c6746bb768dc9055a6f..8a22895fc148998b38b22c728366d0d5707c20bd 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "typetest.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -189,7 +185,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     char std_buf[200];
     std_file_input >> std_buf;
-    str.FromAscii(std_buf);
+    str = wxString::FromAscii(std_buf);
     tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
 
@@ -889,7 +885,7 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl << _T("\nTest wchar_t to char (Unicode to ANSI/Multibyte) converions:");
 
     wxString str;
-    str = _T("Robert Röbling\n");
+    str = _T("Robert R\366bling\n");
 
     printf( "\n\nConversion with wxConvLocal:\n" );
     wxConvCurrent = &wxConvLocal;
@@ -955,13 +951,13 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
             wxFileType::MessageParameters params(filename, type);
             filetype->GetOpenCommand(&open, params);
 
-            textCtrl << _T("MIME information about extension '") << ext << _T("'\n")
+            textCtrl << _T("MIME information about extension '") << ext << _T('\n')
                      << _T("\tMIME type: ") << ( !type ? wxT("unknown")
-                                                   : type.c_str() ) << '\n'
+                                                   : type.c_str() ) << _T('\n')
                      << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() )
-                        << '\n'
+                        << _T('\n')
                      << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() )
-                        << '\n';
+                        << _T('\n');
 
             delete filetype;
         }
@@ -1028,9 +1024,9 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     wxUnusedVar(l);
     wxUnusedVar(v);
 
-    wxStringList stringList;
-    stringList.Add(_T("one")); stringList.Add(_T("two")); stringList.Add(_T("three"));
-    var1 = stringList;
+    wxArrayString stringArray;
+    stringArray.Add(_T("one")); stringArray.Add(_T("two")); stringArray.Add(_T("three"));
+    var1 = stringArray;
     textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
 
     var1.ClearList();