Got Penguin sample running under Windows.

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 427402e6e737b1629d43137bedd17a29c17b7f90..59bc12f3db433001418283294be1e3b49f6cb348 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -30,7 +30,7 @@
 
 #include "typetest.h"
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "mondrian.xpm"
 #endif
 
@@ -235,10 +235,10 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     wxTextCtrl& textCtrl = * GetTextCtrl();
 
     wxVariant var1 = "String value";
-    textCtrl << "var1 = " << (wxString) var1 << "\n";
+    textCtrl << "var1 = " << var1.MakeString() << "\n";
 
-    // Implicit conversion
-    wxString str = var1;
+    // Conversion
+    wxString str = var1.MakeString();
 
     var1 = 123.456;
     textCtrl << "var1 = " << var1.GetReal() << "\n";
@@ -255,20 +255,20 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     wxStringList stringList;
     stringList.Add("one"); stringList.Add("two"); stringList.Add("three");
     var1 = stringList;
-    textCtrl << "var1 = " << (wxString) var1 << "\n";
+    textCtrl << "var1 = " << var1.MakeString() << "\n";
 
     var1.ClearList();
     var1.Append(wxVariant(1.2345));
     var1.Append(wxVariant("hello"));
     var1.Append(wxVariant(54321L));
 
-    textCtrl << "var1 = " << (wxString) var1 << "\n";
+    textCtrl << "var1 = " << var1.MakeString() << "\n";
 
     size_t n = var1.GetCount();
     size_t i;
     for (i = (size_t) 0; i < n; i++)
     {
-        textCtrl << "var1[" << (int) i << "] (type " << var1[i].GetType() << ") = " << (wxString) var1[i] << "\n";
+        textCtrl << "var1[" << (int) i << "] (type " << var1[i].GetType() << ") = " << var1[i].MakeString() << "\n";
     }
 }