X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..aadb4d67c86fcb5af00804dc6dfb718d82078b2e:/samples/htlbox/htlbox.cpp?ds=sidebyside
diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index 162fce3ef2..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);
@@ -127,7 +133,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 +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)
@@ -192,11 +200,11 @@ 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
- 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,
@@ -248,7 +257,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 +281,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 +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());
@@ -335,7 +349,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 +363,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 +405,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 +418,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 +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("Just updated
"));
+ }
+
#ifdef USE_HTML_FILE
wxString s;
if ( m_file.IsOpened() )
@@ -446,9 +473,9 @@ wxString MyHtmlListBox::OnGetItem(size_t n) const
_T("Item %lu")
_T(""),
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 +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);
+}
+