fix for dmc compilation of projects with more than one obj

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 4d8ab2866ddfcd99e19cf488dc6a53c9c4721924..71507f11a1db93b6608832589a778dcc9483965a 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -1052,6 +1052,15 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     {
         textCtrl << _T("var1[") << (int) i << _T("] (type ") << var1[i].GetType() << _T(") = ") << var1[i].MakeString() << _T("\n");
     }
     {
         textCtrl << _T("var1[") << (int) i << _T("] (type ") << var1[i].GetType() << _T(") = ") << var1[i].MakeString() << _T("\n");
     }

+
+    var1 = wxVariant(new wxFont(wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT)));
+    textCtrl << _T("var1 = (wxfont)\"");
+    wxFont* font = wxGetVariantCast(var1,wxFont);
+    if (font) {
+       textCtrl << font->GetNativeFontInfoDesc() << _T("\"\n");
+    } else {
+       textCtrl << _T("(null)\"\n");
+    }

 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)