X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8520f1374ceec64abae3802984c4f8654d8836ba..7f47faf4f2fb142f715e3e47ed6f25a002d7a5d2:/samples/htlbox/htlbox.cpp

diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index 93b6d26f58..419def086c 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -37,6 +37,7 @@
     #include "wx/textctrl.h"
 
     #include "wx/dc.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/colordlg.h"
@@ -51,14 +52,7 @@
     #include "wx/textfile.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-
-// the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
-    #include "mondrian.xpm"
-#endif
+#include "../sample.xpm"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -72,16 +66,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 +108,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);
@@ -144,6 +150,7 @@ enum
     HtmlLbox_DrawSeparator,
     HtmlLbox_ToggleMulti,
     HtmlLbox_SelectAll,
+    HtmlLbox_UpdateItem,
 
     HtmlLbox_SetBgCol,
     HtmlLbox_SetSelBgCol,
@@ -166,6 +173,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)
 
@@ -196,7 +204,7 @@ MyFrame::MyFrame()
                  wxDefaultPosition, wxSize(400, 500))
 {
     // set the frame icon
-    SetIcon(wxICON(mondrian));
+    SetIcon(wxIcon(sample_xpm));
 
 #if wxUSE_MENUS
     // create a menu bar
@@ -217,6 +225,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,
@@ -280,7 +289,7 @@ 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 +336,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());
@@ -408,6 +422,8 @@ MyHtmlListBox::MyHtmlListBox(wxWindow *parent, bool multi)
                              multi ? wxLB_MULTIPLE : 0)
 {
     m_change = true;
+    m_firstItemUpdated = false;
+
 
     SetMargins(5, 5);
 
@@ -440,6 +456,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() )
@@ -452,9 +473,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
 }
@@ -464,3 +485,10 @@ wxColour MyHtmlListBox::GetSelectedTextColour(const wxColour& colFg) const
     return m_change ? wxHtmlListBox::GetSelectedTextColour(colFg) : colFg;
 }
 
+void MyHtmlListBox::UpdateFirstItem()
+{
+    m_firstItemUpdated = !m_firstItemUpdated;
+
+    RefreshLine(0);
+}
+