X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f196316400fd247a760b2ef77d5064b4e10e5471..20125017a4bccd0920ee21e178950b0de0e4d63b:/samples/htlbox/htlbox.cpp
diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index 1d65bf48e9..94a17e5112 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -95,7 +95,7 @@ public:
wxTextFile m_file;
#endif
- DECLARE_NO_COPY_CLASS(MyHtmlListBox)
+ wxDECLARE_NO_COPY_CLASS(MyHtmlListBox);
DECLARE_DYNAMIC_CLASS(MyHtmlListBox)
};
@@ -116,18 +116,20 @@ public:
void OnToggleMulti(wxCommandEvent& event);
void OnSelectAll(wxCommandEvent& event);
void OnUpdateItem(wxCommandEvent& event);
+ void OnGetItemRect(wxCommandEvent& event);
void OnSetBgCol(wxCommandEvent& event);
void OnSetSelBgCol(wxCommandEvent& event);
void OnSetSelFgCol(wxCommandEvent& event);
+ void OnClear(wxCommandEvent& event);
void OnUpdateUISelectAll(wxUpdateUIEvent& event);
void OnLboxSelect(wxCommandEvent& event);
void OnLboxDClick(wxCommandEvent& event)
{
- wxLogMessage(_T("Listbox item %d double clicked."), event.GetInt());
+ wxLogMessage(wxT("Listbox item %d double clicked."), event.GetInt());
}
void OnHtmlLinkClicked(wxHtmlLinkEvent& event);
@@ -171,11 +173,14 @@ enum
HtmlLbox_ToggleMulti,
HtmlLbox_SelectAll,
HtmlLbox_UpdateItem,
+ HtmlLbox_GetItemRect,
HtmlLbox_SetBgCol,
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)
@@ -196,6 +201,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(HtmlLbox_ToggleMulti, MyFrame::OnToggleMulti)
EVT_MENU(HtmlLbox_SelectAll, MyFrame::OnSelectAll)
EVT_MENU(HtmlLbox_UpdateItem, MyFrame::OnUpdateItem)
+ EVT_MENU(HtmlLbox_GetItemRect, MyFrame::OnGetItemRect)
EVT_MENU(HtmlLbox_About, MyFrame::OnAbout)
@@ -203,6 +209,8 @@ 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)
@@ -229,53 +237,57 @@ IMPLEMENT_APP(MyApp)
// frame constructor
MyFrame::MyFrame()
- : wxFrame(NULL, wxID_ANY, _T("HtmlLbox wxWidgets Sample"),
+ : wxFrame(NULL, wxID_ANY, wxT("HtmlLbox wxWidgets Sample"),
wxDefaultPosition, wxSize(500, 500))
{
// set the frame icon
- SetIcon(wxIcon(sample_xpm));
+ SetIcon(wxICON(sample));
#if wxUSE_MENUS
// create a menu bar
wxMenu *menuFile = new wxMenu;
- menuFile->AppendRadioItem(HtmlLbox_CustomBox, _T("Use custom box"),
- _T("Use a wxHtmlListBox virtual class control"));
- menuFile->AppendRadioItem(HtmlLbox_SimpleBox, _T("Use simple box"),
- _T("Use a wxSimpleHtmlListBox control"));
+ menuFile->AppendRadioItem(HtmlLbox_CustomBox, wxT("Use custom box"),
+ wxT("Use a wxHtmlListBox virtual class control"));
+ menuFile->AppendRadioItem(HtmlLbox_SimpleBox, wxT("Use simple box"),
+ wxT("Use a wxSimpleHtmlListBox control"));
menuFile->AppendSeparator();
- menuFile->Append(HtmlLbox_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
+ menuFile->Append(HtmlLbox_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
// create our specific menu
wxMenu *menuHLbox = new wxMenu;
menuHLbox->Append(HtmlLbox_SetMargins,
- _T("Set &margins...\tCtrl-G"),
- _T("Change the margins around the items"));
+ wxT("Set &margins...\tCtrl-G"),
+ wxT("Change the margins around the items"));
menuHLbox->AppendCheckItem(HtmlLbox_DrawSeparator,
- _T("&Draw separators\tCtrl-D"),
- _T("Toggle drawing separators between cells"));
+ wxT("&Draw separators\tCtrl-D"),
+ wxT("Toggle drawing separators between cells"));
menuHLbox->AppendSeparator();
menuHLbox->AppendCheckItem(HtmlLbox_ToggleMulti,
- _T("&Multiple selection\tCtrl-M"),
- _T("Toggle multiple selection on/off"));
+ wxT("&Multiple selection\tCtrl-M"),
+ wxT("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->Append(HtmlLbox_SelectAll, wxT("Select &all items\tCtrl-A"));
+ menuHLbox->Append(HtmlLbox_UpdateItem, wxT("Update &first item\tCtrl-U"));
+ menuHLbox->Append(HtmlLbox_GetItemRect, wxT("Show &rectangle of item #10\tCtrl-R"));
menuHLbox->AppendSeparator();
- menuHLbox->Append(HtmlLbox_SetBgCol, _T("Set &background...\tCtrl-B"));
+ menuHLbox->Append(HtmlLbox_SetBgCol, wxT("Set &background...\tCtrl-B"));
menuHLbox->Append(HtmlLbox_SetSelBgCol,
- _T("Set &selection background...\tCtrl-S"));
+ wxT("Set &selection background...\tCtrl-S"));
menuHLbox->AppendCheckItem(HtmlLbox_SetSelFgCol,
- _T("Keep &foreground in selection\tCtrl-F"));
+ wxT("Keep &foreground in selection\tCtrl-F"));
+
+ menuHLbox->AppendSeparator();
+ menuHLbox->Append(HtmlLbox_Clear, wxT("&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"));
+ helpMenu->Append(HtmlLbox_About, wxT("&About\tF1"), wxT("Show about dialog"));
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(menuFile, _T("&File"));
- menuBar->Append(menuHLbox, _T("&Listbox"));
- menuBar->Append(helpMenu, _T("&Help"));
+ menuBar->Append(menuFile, wxT("&File"));
+ menuBar->Append(menuHLbox, wxT("&Listbox"));
+ menuBar->Append(helpMenu, wxT("&Help"));
menuBar->Check(HtmlLbox_DrawSeparator, true);
@@ -286,12 +298,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 wxWidgets!"));
+ SetStatusText(wxT("Welcome to wxWidgets!"));
#endif // wxUSE_STATUSBAR
// create the child controls
CreateBox();
- wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, _T(""),
+ wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, wxT(""),
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE);
delete wxLog::SetActiveTarget(new wxLogTextCtrl(text));
@@ -333,9 +345,9 @@ void MyFrame::CreateBox()
(unsigned char)(abs((int)n - 128) % 256));
int level = n % 6 + 1;
- wxString label = wxString::Format(_T("