X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..61c213fe224da24ce33c9187263e75a17ca83a04:/samples/htlbox/htlbox.cpp?ds=sidebyside

diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index 162fce3ef2..95d99d5c0e 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -72,16 +72,27 @@ public:
     MyHtmlListBox(wxWindow *parent, bool multi = false);
 
     void SetChangeSelFg(bool change) { m_change = change; }
+    void UpdateFirstItem();
 
 protected:
+    // override this method to return data to be shown in the listbox (this is
+    // mandatory)
     virtual wxString OnGetItem(size_t n) const;
 
-    // change the appearance by overriding these functions
+    // change the appearance by overriding these functions (this is optional)
     virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const;
     virtual wxColour GetSelectedTextColour(const wxColour& colFg) const;
 
+
+    // flag telling us whether we should use fg colour even for the selected
+    // item
     bool m_change;
 
+    // flag which we toggle to update the first items text in OnGetItem()
+    bool m_firstItemUpdated;
+
+
+
 #ifdef USE_HTML_FILE
     wxTextFile m_file;
 #endif
@@ -103,6 +114,7 @@ public:
     void OnDrawSeparator(wxCommandEvent&) { m_hlbox->RefreshAll(); }
     void OnToggleMulti(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);
+    void OnUpdateItem(wxCommandEvent& event);
 
     void OnSetBgCol(wxCommandEvent& event);
     void OnSetSelBgCol(wxCommandEvent& event);
@@ -127,7 +139,7 @@ private:
 class MyApp : public wxApp
 {
 public:
-    virtual bool OnInit() { (new MyFrame())->Show(); return TRUE; }
+    virtual bool OnInit() { (new MyFrame())->Show(); return true; }
 };
 
 // ----------------------------------------------------------------------------
@@ -144,6 +156,7 @@ enum
     HtmlLbox_DrawSeparator,
     HtmlLbox_ToggleMulti,
     HtmlLbox_SelectAll,
+    HtmlLbox_UpdateItem,
 
     HtmlLbox_SetBgCol,
     HtmlLbox_SetSelBgCol,
@@ -166,6 +179,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(HtmlLbox_DrawSeparator, MyFrame::OnDrawSeparator)
     EVT_MENU(HtmlLbox_ToggleMulti, MyFrame::OnToggleMulti)
     EVT_MENU(HtmlLbox_SelectAll, MyFrame::OnSelectAll)
+    EVT_MENU(HtmlLbox_UpdateItem, MyFrame::OnUpdateItem)
 
     EVT_MENU(HtmlLbox_About, MyFrame::OnAbout)
 
@@ -192,7 +206,7 @@ IMPLEMENT_APP(MyApp)
 
 // frame constructor
 MyFrame::MyFrame()
-       : wxFrame(NULL, -1, _T("HtmlLbox wxWidgets Sample"),
+       : wxFrame(NULL, wxID_ANY, _T("HtmlLbox wxWidgets Sample"),
                  wxDefaultPosition, wxSize(400, 500))
 {
     // set the frame icon
@@ -217,6 +231,7 @@ MyFrame::MyFrame()
                                _T("Toggle multiple selection on/off"));
     menuHLbox->AppendSeparator();
     menuHLbox->Append(HtmlLbox_SelectAll, _T("Select &all items\tCtrl-A"));
+    menuHLbox->Append(HtmlLbox_UpdateItem, _T("Update &first item\tCtrl-U"));
     menuHLbox->AppendSeparator();
     menuHLbox->Append(HtmlLbox_SetBgCol, _T("Set &background...\tCtrl-B"));
     menuHLbox->Append(HtmlLbox_SetSelBgCol,
@@ -248,7 +263,7 @@ MyFrame::MyFrame()
 
     // 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));
@@ -272,15 +287,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);
@@ -327,6 +342,11 @@ void MyFrame::OnUpdateUISelectAll(wxUpdateUIEvent& event)
     event.Enable( m_hlbox && m_hlbox->HasMultipleSelection() );
 }
 
+void MyFrame::OnUpdateItem(wxCommandEvent& WXUNUSED(event))
+{
+    m_hlbox->UpdateFirstItem();
+}
+
 void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
     wxColour col = wxGetColourFromUser(this, m_hlbox->GetBackgroundColour());
@@ -335,7 +355,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
     }
 }
 
@@ -347,7 +369,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
     }
 }
 
@@ -387,10 +411,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
 }
 
 // ============================================================================
@@ -398,10 +424,12 @@ 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;
+    m_firstItemUpdated = false;
+
 
     SetMargins(5, 5);
 
@@ -434,6 +462,11 @@ void MyHtmlListBox::OnDrawSeparator(wxDC& dc, wxRect& rect, size_t) const
 
 wxString MyHtmlListBox::OnGetItem(size_t n) const
 {
+    if ( !n && m_firstItemUpdated )
+    {
+        return wxString::Format(_T("<h1><b>Just updated</b></h1>"));
+    }
+
 #ifdef USE_HTML_FILE
     wxString s;
     if ( m_file.IsOpened() )
@@ -446,9 +479,9 @@ wxString MyHtmlListBox::OnGetItem(size_t n) const
                             _T("Item</font> <b>%lu</b>")
                             _T("</h%d>"),
                             level,
-                            abs(n - 192) % 256,
-                            abs(n - 256) % 256,
-                            abs(n - 128) % 256,
+                            abs((int)n - 192) % 256,
+                            abs((int)n - 256) % 256,
+                            abs((int)n - 128) % 256,
                             (unsigned long)n, level);
 #endif
 }
@@ -458,3 +491,10 @@ wxColour MyHtmlListBox::GetSelectedTextColour(const wxColour& colFg) const
     return m_change ? wxHtmlListBox::GetSelectedTextColour(colFg) : colFg;
 }
 
+void MyHtmlListBox::UpdateFirstItem()
+{
+    m_firstItemUpdated = !m_firstItemUpdated;
+
+    RefreshLine(0);
+}
+