X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ebb7cade2df5aeb8531950d2a79cd57a336bcec..30738aae14dfbce0c492d8696c861947228028c2:/samples/htlbox/htlbox.cpp

diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index a53accf347..831dd2c839 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -78,9 +78,6 @@ protected:
     virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const;
     virtual wxColour GetSelectedTextColour(const wxColour& colFg) const;
 
-    // override this method to handle mouse clicks
-    virtual void OnLinkClicked(size_t n, const wxHtmlLinkInfo& link);
-
     // flag telling us whether we should use fg colour even for the selected
     // item
     bool m_change;
@@ -88,11 +85,12 @@ protected:
     // flag which we toggle to update the first items text in OnGetItem()
     bool m_firstItemUpdated;
 
+public:
+
     // flag which we toggle when the user clicks on the link in 2nd item
     // to change 2nd item's text
     bool m_linkClicked;
 
-
 #ifdef USE_HTML_FILE
     wxTextFile m_file;
 #endif
@@ -123,6 +121,7 @@ public:
     void OnSetSelBgCol(wxCommandEvent& event);
     void OnSetSelFgCol(wxCommandEvent& event);
 
+    void OnClear(wxCommandEvent& event);
 
     void OnUpdateUISelectAll(wxUpdateUIEvent& event);
 
@@ -131,8 +130,12 @@ public:
     {
         wxLogMessage(_T("Listbox item %d double clicked."), event.GetInt());
     }
-    
-    wxSimpleHtmlListBox *GetSimpleBox() 
+
+    void OnHtmlLinkClicked(wxHtmlLinkEvent& event);
+    void OnHtmlCellHover(wxHtmlCellEvent &event);
+    void OnHtmlCellClicked(wxHtmlCellEvent &event);
+
+    wxSimpleHtmlListBox *GetSimpleBox()
         { return wxDynamicCast(m_hlbox, wxSimpleHtmlListBox); }
     MyHtmlListBox *GetMyBox()
         { return wxDynamicCast(m_hlbox, MyHtmlListBox); }
@@ -174,6 +177,8 @@ enum
     HtmlLbox_SetSelBgCol,
     HtmlLbox_SetSelFgCol,
 
+    HtmlLbox_Clear,
+
     // it is important for the id corresponding to the "About" command to have
     // this standard value as otherwise it won't be handled properly under Mac
     // (where it is special and put into the "Apple" menu)
@@ -201,11 +206,20 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(HtmlLbox_SetSelBgCol, MyFrame::OnSetSelBgCol)
     EVT_MENU(HtmlLbox_SetSelFgCol, MyFrame::OnSetSelFgCol)
 
+    EVT_MENU(HtmlLbox_Clear, MyFrame::OnClear)
+
     EVT_UPDATE_UI(HtmlLbox_SelectAll, MyFrame::OnUpdateUISelectAll)
 
 
     EVT_LISTBOX(wxID_ANY, MyFrame::OnLboxSelect)
     EVT_LISTBOX_DCLICK(wxID_ANY, MyFrame::OnLboxDClick)
+
+
+    // the HTML listbox's events
+    EVT_HTML_LINK_CLICKED(wxID_ANY, MyFrame::OnHtmlLinkClicked)
+    EVT_HTML_CELL_HOVER(wxID_ANY, MyFrame::OnHtmlCellHover)
+    EVT_HTML_CELL_CLICKED(wxID_ANY, MyFrame::OnHtmlCellClicked)
+
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
@@ -229,9 +243,9 @@ MyFrame::MyFrame()
 #if wxUSE_MENUS
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
-    menuFile->AppendRadioItem(HtmlLbox_CustomBox, _T("Use custom box"), 
+    menuFile->AppendRadioItem(HtmlLbox_CustomBox, _T("Use custom box"),
                               _T("Use a wxHtmlListBox virtual class control"));
-    menuFile->AppendRadioItem(HtmlLbox_SimpleBox, _T("Use simple box"), 
+    menuFile->AppendRadioItem(HtmlLbox_SimpleBox, _T("Use simple box"),
                               _T("Use a wxSimpleHtmlListBox control"));
     menuFile->AppendSeparator();
     menuFile->Append(HtmlLbox_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
@@ -258,6 +272,9 @@ MyFrame::MyFrame()
     menuHLbox->AppendCheckItem(HtmlLbox_SetSelFgCol,
                                _T("Keep &foreground in selection\tCtrl-F"));
 
+    menuHLbox->AppendSeparator();
+    menuHLbox->Append(HtmlLbox_Clear, _T("&Clear\tCtrl-L"));
+
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append(HtmlLbox_About, _T("&About...\tF1"), _T("Show about dialog"));
@@ -279,7 +296,7 @@ MyFrame::MyFrame()
     CreateStatusBar(2);
     SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
-    
+
     // create the child controls
     CreateBox();
     wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, _T(""),
@@ -312,7 +329,7 @@ void MyFrame::CreateBox()
     {
         m_hlbox = new wxSimpleHtmlListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                           0, NULL, multi ? wxLB_MULTIPLE : 0);
-        
+
         // unlike wxHtmlListBox which is abstract, wxSimpleHtmlListBox is a
         // concrete control and doesn't support virtual mode, this we need
         // to add all of its items from the beginning
@@ -345,12 +362,12 @@ void MyFrame::CreateBox()
 void MyFrame::OnSimpleOrCustomBox(wxCommandEvent& WXUNUSED(event))
 {
     wxWindow *old = m_hlbox;
- 
+
     // we need to recreate the listbox
     CreateBox();
     GetSizer()->Replace(old, m_hlbox);
     delete old;
-    
+
     GetSizer()->Layout();
     Refresh();
 }
@@ -392,7 +409,7 @@ void MyFrame::OnSetMargins(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnToggleMulti(wxCommandEvent& WXUNUSED(event))
 {
     wxWindow *old = m_hlbox;
- 
+
     // we need to recreate the listbox
     CreateBox();
     GetSizer()->Replace(old, m_hlbox);
@@ -454,6 +471,37 @@ void MyFrame::OnSetSelFgCol(wxCommandEvent& event)
     }
 }
 
+void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
+{
+    m_hlbox->Clear();
+}
+
+void MyFrame::OnHtmlLinkClicked(wxHtmlLinkEvent &event)
+{
+    wxLogMessage(wxT("The url '%s' has been clicked!"), event.GetLinkInfo().GetHref().c_str());
+
+    if (GetMyBox())
+    {
+        GetMyBox()->m_linkClicked = true;
+        GetMyBox()->RefreshRow(1);
+    }
+}
+
+void MyFrame::OnHtmlCellHover(wxHtmlCellEvent &event)
+{
+    wxLogMessage(wxT("Mouse moved over cell %p at %d;%d"),
+                 event.GetCell(), event.GetPoint().x, event.GetPoint().y);
+}
+
+void MyFrame::OnHtmlCellClicked(wxHtmlCellEvent &event)
+{
+    wxLogMessage(wxT("Click over cell %p at %d;%d"),
+                 event.GetCell(), event.GetPoint().x, event.GetPoint().y);
+
+    // if we don't skip the event, OnHtmlLinkClicked won't be called!
+    event.Skip();
+}
+
 // ----------------------------------------------------------------------------
 // listbox event handlers
 // ----------------------------------------------------------------------------
@@ -540,7 +588,7 @@ wxString MyHtmlListBox::OnGetItem(size_t n) const
 {
     if ( !n && m_firstItemUpdated )
     {
-        return wxString::Format(_T("<h1><b>Just updated</b></h1>"));
+        return _T("<h1><b>Just updated</b></h1>");
     }
 
 #ifdef USE_HTML_FILE
@@ -583,14 +631,5 @@ void MyHtmlListBox::UpdateFirstItem()
 {
     m_firstItemUpdated = !m_firstItemUpdated;
 
-    RefreshLine(0);
+    RefreshRow(0);
 }
-
-void MyHtmlListBox::OnLinkClicked(size_t WXUNUSED(n),
-                                  const wxHtmlLinkInfo& WXUNUSED(link))
-{
-    m_linkClicked = true;
-
-    RefreshLine(1);
-}
-