X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e6e6f8ab806b337dffeb3b52fec7eba3c845ef..78eecde0860f23a11932c53b1e59e41a6effd6bb:/samples/combo/combo.cpp

diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index 2d705f1523..fd5abd249d 100644
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -383,9 +383,7 @@ public:
     {
         return wxTreeCtrl::Create(parent,1,
                                   wxPoint(0,0),wxDefaultSize,
-                                  wxTR_HIDE_ROOT|wxTR_HAS_BUTTONS|
-                                  wxTR_SINGLE|wxTR_LINES_AT_ROOT|
-                                  wxSIMPLE_BORDER);
+                                  wxTR_DEFAULT_STYLE | wxTR_HIDE_ROOT | wxSIMPLE_BORDER );
     }
 
     virtual void OnShow()
@@ -534,11 +532,17 @@ public:
         m_animTimer.SetOwner( this, wxID_ANY );
         m_animTimer.Start( 10, wxTIMER_CONTINUOUS );
 
-        OnTimerEvent(*((wxTimerEvent*)NULL));  // Event is never used, so we can give NULL
+        DoOnTimer();
         return false;
     }
 
+private:
     void OnTimerEvent( wxTimerEvent& WXUNUSED(event) )
+    {
+        DoOnTimer();
+    }
+
+    void DoOnTimer()
     {
         bool stopTimer = false;
 
@@ -594,8 +598,6 @@ public:
         }
     }
 
-protected:
-
     // Popup animation related
     wxLongLong  m_animStart;
     wxTimer     m_animTimer;
@@ -603,7 +605,6 @@ protected:
     wxBitmap    m_animBackBitmap;
     int         m_animFlags;
 
-private:
     DECLARE_EVENT_TABLE()
 };
 
@@ -747,7 +748,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 );