Use template class instead of template function in wxVectorSort().

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

diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index 2d705f1523cc651897f416e6b90696c242e00953..288fbc27e739fc2cd21eaab4021a468d9def1d9b 100644 (file)
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -158,7 +158,7 @@ bool MyApp::OnInit()
         return false;
 
     // create the main application window
         return false;
 
     // create the main application window

-    MyFrame *frame = new MyFrame(_T("wxComboCtrl and wxOwnerDrawnComboBox Sample"));
+    MyFrame *frame = new MyFrame(wxT("wxComboCtrl and wxOwnerDrawnComboBox Sample"));

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)


@@ -383,9 +383,7 @@ public:
     {
         return wxTreeCtrl::Create(parent,1,
                                   wxPoint(0,0),wxDefaultSize,
     {
         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()
     }
 
     virtual void OnShow()


@@ -534,11 +532,17 @@ public:
         m_animTimer.SetOwner( this, wxID_ANY );
         m_animTimer.Start( 10, wxTIMER_CONTINUOUS );
 
         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;
     }
 
         return false;
     }
 

+private:

     void OnTimerEvent( wxTimerEvent& WXUNUSED(event) )
     void OnTimerEvent( wxTimerEvent& WXUNUSED(event) )

+    {
+        DoOnTimer();
+    }
+
+    void DoOnTimer()

     {
         bool stopTimer = false;
 
     {
         bool stopTimer = false;
 


@@ -594,8 +598,6 @@ public:
         }
     }
 
         }
     }
 

-protected:
-

     // Popup animation related
     wxLongLong  m_animStart;
     wxTimer     m_animTimer;
     // Popup animation related
     wxLongLong  m_animStart;
     wxTimer     m_animTimer;


@@ -603,7 +605,6 @@ protected:
     wxBitmap    m_animBackBitmap;
     int         m_animFlags;
 
     wxBitmap    m_animBackBitmap;
     int         m_animFlags;
 

-private:

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -723,17 +724,17 @@ MyFrame::MyFrame(const wxString& title)
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(ComboControl_About, _T("&About...\tF1"), _T("Show about dialog"));
+    helpMenu->Append(ComboControl_About, wxT("&About...\tF1"), wxT("Show about dialog"));

 
 

-    fileMenu->Append(ComboControl_Compare, _T("&Compare against wxComboBox..."),
-        _T("Show some wxOwnerDrawnComboBoxes side-by-side with native wxComboBoxes."));
+    fileMenu->Append(ComboControl_Compare, wxT("&Compare against wxComboBox..."),
+        wxT("Show some wxOwnerDrawnComboBoxes side-by-side with native wxComboBoxes."));

     fileMenu->AppendSeparator();
     fileMenu->AppendSeparator();

-    fileMenu->Append(ComboControl_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
+    fileMenu->Append(ComboControl_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();

-    menuBar->Append(fileMenu, _T("&File"));
-    menuBar->Append(helpMenu, _T("&Help"));
+    menuBar->Append(fileMenu, wxT("&File"));
+    menuBar->Append(helpMenu, wxT("&Help"));

 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);


@@ -742,12 +743,13 @@ MyFrame::MyFrame(const wxString& title)
     wxPanel* panel = new wxPanel(this);
 
     // Prepare log window right away since it shows EVT_TEXTs
     wxPanel* panel = new wxPanel(this);
 
     // Prepare log window right away since it shows EVT_TEXTs

-    m_logWin = new wxTextCtrl( panel, 105, wxEmptyString, wxDefaultPosition,
-                               wxSize(-1,125), wxTE_MULTILINE|wxFULL_REPAINT_ON_RESIZE );
-    m_logWin->SetEditable(false);
-    wxLogTextCtrl* logger = new wxLogTextCtrl( m_logWin );
-    m_logOld = logger->SetActiveTarget( logger );
-    logger->SetTimestamp( NULL );
+    m_logWin = new wxTextCtrl(panel, 105, wxEmptyString,
+                              wxDefaultPosition,
+                              wxSize(-1, 125),
+                              wxTE_MULTILINE);
+    wxLogTextCtrl* logger = new wxLogTextCtrl(m_logWin);
+    m_logOld = logger->SetActiveTarget(logger);
+    logger->DisableTimestamp();

 
 
     topSizer = new wxBoxSizer( wxVERTICAL );
 
 
     topSizer = new wxBoxSizer( wxVERTICAL );


@@ -1041,9 +1043,13 @@ void MyFrame::OnComboBoxUpdate( wxCommandEvent& event )
         return;
 
     if ( event.GetEventType() == wxEVT_COMMAND_COMBOBOX_SELECTED )
         return;
 
     if ( event.GetEventType() == wxEVT_COMMAND_COMBOBOX_SELECTED )

+    {

         wxLogDebug(wxT("EVT_COMBOBOX(id=%i,selection=%i)"),event.GetId(),event.GetSelection());
         wxLogDebug(wxT("EVT_COMBOBOX(id=%i,selection=%i)"),event.GetId(),event.GetSelection());

+    }

     else if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
     else if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )

+    {

         wxLogDebug(wxT("EVT_TEXT(id=%i,string=\"%s\")"),event.GetId(),event.GetString().c_str());
         wxLogDebug(wxT("EVT_TEXT(id=%i,string=\"%s\")"),event.GetId(),event.GetString().c_str());

+    }

 }
 
 void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) )


@@ -1201,14 +1207,14 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox(wxString::Format(
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox(wxString::Format(

-                    _T("Welcome to %s!\n")
-                    _T("\n")
-                    _T("This is the wxWidgets wxComboCtrl and wxOwnerDrawnComboBox sample\n")
-                    _T("running under %s."),
+                    wxT("Welcome to %s!\n")
+                    wxT("\n")
+                    wxT("This is the wxWidgets wxComboCtrl and wxOwnerDrawnComboBox sample\n")
+                    wxT("running under %s."),

                     wxVERSION_STRING,
                     wxGetOsDescription().c_str()
                  ),
                     wxVERSION_STRING,
                     wxGetOsDescription().c_str()
                  ),

-                 _T("About wxComboCtrl sample"),
+                 wxT("About wxComboCtrl sample"),

                  wxOK | wxICON_INFORMATION,
                  this);
 }
                  wxOK | wxICON_INFORMATION,
                  this);
 }