X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30be036c6d4990f8aa21af5b86abdc0852e686a0..351461fc83230e0193084488af7bc9f5c31fe3e5:/samples/combo/combo.cpp?ds=sidebyside

diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index e4cde90f95..cb2f5238c2 100644
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -154,6 +154,9 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxComboCtrl and wxOwnerDrawnComboBox Sample"));
 
@@ -744,7 +747,7 @@ MyFrame::MyFrame(const wxString& title)
     m_logWin->SetEditable(false);
     wxLogTextCtrl* logger = new wxLogTextCtrl( m_logWin );
     m_logOld = logger->SetActiveTarget( logger );
-    logger->SetTimestamp( NULL );
+    logger->DisableTimestamp();
 
 
     topSizer = new wxBoxSizer( wxVERTICAL );