Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed wxHyperlinkCtrl from this sample, it's not in the widgets one

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-03 12:41:00 +00:00
parent c4ef14c263
commit 3126a4ee61
2 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/controls/controls.bkl
View File

@@ -9,7 +9,7 @@
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>controls.rc</win32-res> <win32-res>controls.rc</win32-res>
</exe> </exe>
<wx-data id="data"> <wx-data id="data">
<files> <files>
test2.bmp test2.bmp

42
samples/controls/controls.cpp
View File

@@ -59,9 +59,6 @@
#define EVT_TOGGLEBUTTON EVT_CHECKBOX #define EVT_TOGGLEBUTTON EVT_CHECKBOX
#endif #endif
#include "wx/hyperlink.h"
#include "wx/utils.h"
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// class definitions // class definitions
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -124,10 +121,6 @@ public:
void OnSizerCheck (wxCommandEvent &event); void OnSizerCheck (wxCommandEvent &event);
#if wxUSE_HYPERLINKCTRL
void OnHyperlink(wxHyperlinkEvent& event);
#endif
wxListBox *m_listbox, wxListBox *m_listbox,
*m_listboxSorted; *m_listboxSorted;
#if wxUSE_CHOICE #if wxUSE_CHOICE
@@ -176,10 +169,6 @@ public:
wxBoxSizer *m_hsizer; wxBoxSizer *m_hsizer;
wxButton *m_bigBtn; wxButton *m_bigBtn;
#if wxUSE_HYPERLINKCTRL
wxHyperlinkCtrl *m_hyperlink;
#endif
private: private:
wxLog *m_logTargetOld; wxLog *m_logTargetOld;
@@ -569,9 +558,6 @@ EVT_BUTTON (ID_BUTTON_TEST1, MyPanel::OnTestButton)
EVT_BUTTON (ID_BUTTON_TEST2, MyPanel::OnTestButton) EVT_BUTTON (ID_BUTTON_TEST2, MyPanel::OnTestButton)
EVT_BUTTON (ID_BITMAP_BTN, MyPanel::OnBmpButton) EVT_BUTTON (ID_BITMAP_BTN, MyPanel::OnBmpButton)
EVT_TOGGLEBUTTON(ID_BITMAP_BTN_ENABLE, MyPanel::OnBmpButtonToggle) EVT_TOGGLEBUTTON(ID_BITMAP_BTN_ENABLE, MyPanel::OnBmpButtonToggle)
#if wxUSE_HYPERLINKCTRL
EVT_HYPERLINK (ID_HYPERLINK, MyPanel::OnHyperlink)
#endif
EVT_CHECKBOX (ID_SIZER_CHECK1, MyPanel::OnSizerCheck) EVT_CHECKBOX (ID_SIZER_CHECK1, MyPanel::OnSizerCheck)
EVT_CHECKBOX (ID_SIZER_CHECK2, MyPanel::OnSizerCheck) EVT_CHECKBOX (ID_SIZER_CHECK2, MyPanel::OnSizerCheck)
@@ -1020,26 +1006,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_book->AddPage(panel, _T("wxBitmapXXX")); m_book->AddPage(panel, _T("wxBitmapXXX"));
// hyperlink
#if wxUSE_HYPERLINKCTRL
panel = new wxPanel(m_book);
m_hyperlink = new wxHyperlinkCtrl(panel, ID_HYPERLINK,
_T("Click here to go to Google!"),
_T("http://www.google.com"),
wxPoint(20, 20));
m_hyperlink->SetVisitedColour(m_hyperlink->GetNormalColour());
m_hyperlink->SetFont(*wxITALIC_FONT);
m_hyperlink->SetBackgroundColour(*wxWHITE);
// this hyperlink will automatically call wxLaunchDefaultBrowser on user's clicks
new wxHyperlinkCtrl(panel, wxID_ANY, wxT("http://www.test.com"),
wxEmptyString, wxPoint(20, 50));
m_book->AddPage(panel, _T("wxHyperlinkCtrl"));
#endif
// sizer // sizer
panel = new wxPanel(m_book); panel = new wxPanel(m_book);
panel->SetAutoLayout( true ); panel->SetAutoLayout( true );
@@ -1716,15 +1683,6 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
#endif // wxUSE_PROGRESSDLG #endif // wxUSE_PROGRESSDLG
#endif // wxUSE_SPINBTN #endif // wxUSE_SPINBTN
#if wxUSE_HYPERLINKCTRL
void MyPanel::OnHyperlink(wxHyperlinkEvent& event)
{
wxLogMessage(wxT("Clicked on hyperlink with url '%s'"), event.GetURL().c_str());
if (!wxLaunchDefaultBrowser(event.GetURL()))
wxMessageBox(_T("Could not launch the default browser!"));
}
#endif //wxUSE_HYPERLINK
void MyPanel::OnSizerCheck( wxCommandEvent &event) void MyPanel::OnSizerCheck( wxCommandEvent &event)
{ {
switch (event.GetId ()) { switch (event.GetId ()) {