X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a9b4940a1f8eef8eb3e7ff65ed45f1daf14c2d9..3dd4386160b8f6d28ecc4ad2ca308c437721a41f:/samples/htlbox/htlbox.cpp

diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index 06563fe4d7..322483f688 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        htmllbox.cpp
-// Purpose:     HtmlLbox wxWindows sample
+// Purpose:     HtmlLbox wxWidgets sample
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -40,6 +40,7 @@
 #endif
 
 #include "wx/colordlg.h"
+#include "wx/numdlg.h"
 
 #include "wx/htmllbox.h"
 
@@ -84,6 +85,8 @@ protected:
 #ifdef USE_HTML_FILE
     wxTextFile m_file;
 #endif
+
+    DECLARE_NO_COPY_CLASS(MyHtmlListBox)
 };
 
 class MyFrame : public wxFrame
@@ -117,14 +120,14 @@ public:
 private:
     MyHtmlListBox *m_hlbox;
 
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
 class MyApp : public wxApp
 {
 public:
-    virtual bool OnInit() { (new MyFrame())->Show(); return TRUE; }
+    virtual bool OnInit() { (new MyFrame())->Show(); return true; }
 };
 
 // ----------------------------------------------------------------------------
@@ -153,7 +156,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -189,7 +192,7 @@ IMPLEMENT_APP(MyApp)
 
 // frame constructor
 MyFrame::MyFrame()
-       : wxFrame(NULL, -1, _T("HtmlLbox wxWindows Sample"),
+       : wxFrame(NULL, wxID_ANY, _T("HtmlLbox wxWidgets Sample"),
                  wxDefaultPosition, wxSize(400, 500))
 {
     // set the frame icon
@@ -240,12 +243,12 @@ MyFrame::MyFrame()
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 
     // create the child controls
     m_hlbox = new MyHtmlListBox(this);
-    wxTextCtrl *text = new wxTextCtrl(this, -1, _T(""),
+    wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, _T(""),
                                       wxDefaultPosition, wxDefaultSize,
                                       wxTE_MULTILINE);
     delete wxLog::SetActiveTarget(new wxLogTextCtrl(text));
@@ -269,15 +272,15 @@ MyFrame::~MyFrame()
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox(_T("This sample shows wxHtmlListBox class.\n")
                  _T("\n")
-                 _T("© 2003 Vadim Zeitlin"),
+                 _T("(c) 2003 Vadim Zeitlin"),
                  _T("About HtmlLbox"),
                  wxOK | wxICON_INFORMATION,
                  this);
@@ -316,7 +319,7 @@ void MyFrame::OnToggleMulti(wxCommandEvent& event)
 
 void MyFrame::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {
-    m_hlbox->SelectRange(0, m_hlbox->GetItemCount() - 1);
+    m_hlbox->SelectAll();
 }
 
 void MyFrame::OnUpdateUISelectAll(wxUpdateUIEvent& event)
@@ -332,7 +335,9 @@ void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
         m_hlbox->SetBackgroundColour(col);
         m_hlbox->Refresh();
 
+#if wxUSE_STATUSBAR
         SetStatusText(_T("Background colour changed."));
+#endif // wxUSE_STATUSBAR
     }
 }
 
@@ -344,7 +349,9 @@ void MyFrame::OnSetSelBgCol(wxCommandEvent& WXUNUSED(event))
         m_hlbox->SetSelectionBackground(col);
         m_hlbox->Refresh();
 
+#if wxUSE_STATUSBAR
         SetStatusText(_T("Selection background colour changed."));
+#endif // wxUSE_STATUSBAR
     }
 }
 
@@ -384,10 +391,12 @@ void MyFrame::OnLboxSelect(wxCommandEvent& event)
             wxLogMessage(_T("Selected items: %s"), s.c_str());
     }
 
+#if wxUSE_STATUSBAR
     SetStatusText(wxString::Format(
                     _T("# items selected = %lu"),
                     (unsigned long)m_hlbox->GetSelectedCount()
                   ));
+#endif // wxUSE_STATUSBAR
 }
 
 // ============================================================================
@@ -395,7 +404,7 @@ void MyFrame::OnLboxSelect(wxCommandEvent& event)
 // ============================================================================
 
 MyHtmlListBox::MyHtmlListBox(wxWindow *parent, bool multi)
-             : wxHtmlListBox(parent, -1, wxDefaultPosition, wxDefaultSize,
+             : wxHtmlListBox(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                              multi ? wxLB_MULTIPLE : 0)
 {
     m_change = true;
@@ -403,23 +412,19 @@ MyHtmlListBox::MyHtmlListBox(wxWindow *parent, bool multi)
     SetMargins(5, 5);
 
 #ifdef USE_HTML_FILE
-    if ( !m_file.Open("results") )
+    if ( !m_file.Open(_T("results")) )
     {
-        wxLogError("Failed to open results file");
+        wxLogError(_T("Failed to open results file"));
     }
     else
     {
         SetItemCount(m_file.GetLineCount());
     }
 #else
-    SetItemCount(10);
+    SetItemCount(1000);
 #endif
 
-    // select something
-    if ( HasMultipleSelection() )
-        Select(3);
-    else
-        SetSelection(3);
+    SetSelection(3);
 }
 
 void MyHtmlListBox::OnDrawSeparator(wxDC& dc, wxRect& rect, size_t) const