X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/630906de0e157ce6eafe10b85c3e4d717b06ba44..0be79c8a802fe65885198d7aa349e4ce7b46315b:/src/html/helpwnd.cpp diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index 38b185a6dd..e14ecb7105 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -19,7 +19,7 @@ #if wxUSE_WXHTML_HELP -#ifndef WXPRECOMP +#ifndef WX_PRECOMP #include "wx/object.h" #include "wx/dynarray.h" #include "wx/intl.h" @@ -40,7 +40,7 @@ #include "wx/toolbar.h" #include "wx/choicdlg.h" #include "wx/filedlg.h" -#endif // WXPRECOMP +#endif // WX_PRECOMP #include "wx/html/helpfrm.h" #include "wx/html/helpdlg.h" @@ -119,6 +119,10 @@ public: const wxMouseEvent *e = ev.GetLinkInfo().GetEvent(); if (e == NULL || e->LeftUp()) m_Window->NotifyPageChanged(); + + // skip the event so that normal processing (i.e. following the link) + // is done: + ev.Skip(); } // Returns full location with anchor (helper) @@ -1195,8 +1199,8 @@ public: wxSize(200, wxDefaultCoord), 0, NULL, wxCB_DROPDOWN | wxCB_READONLY)); - sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY)); - FontSize->SetRange(2, 100); + sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, + wxDefaultSize, wxSP_ARROW_KEYS, 2, 100, 2, _T("wxSpinCtrl"))); topsizer->Add(sizer, 0, wxLEFT|wxRIGHT|wxTOP, 10);