X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1be7a35c5ec31b6cfcab9d969c7969586441a945..f303d69f934a76c56e14713a0748fdd10635e462:/include/wx/scrolwin.h diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index dcbc0ef320..4775724ba3 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -241,6 +241,7 @@ protected: { ScrollDoSetVirtualSize(x, y); } \ virtual wxSize GetBestVirtualSize() const \ { return ScrollGetBestVirtualSize(); } \ +protected: \ virtual wxSize GetWindowSizeForVirtualSize(const wxSize& size) const \ { return ScrollGetWindowSizeForVirtualSize(size); } @@ -282,6 +283,12 @@ public: long style = wxScrolledWindowStyle, const wxString& name = wxPanelNameStr); + // we need to return a special WM_GETDLGCODE value to process just the + // arrows but let the other navigation characters through +#ifdef __WXMSW__ + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); +#endif // __WXMSW__ + WX_FORWARD_TO_SCROLL_HELPER() protected: @@ -289,12 +296,6 @@ protected: // wxScrollHelperEvtHandler::ProcessEvent() void OnPaint(wxPaintEvent& event); - // we need to return a special WM_GETDLGCODE value to process just the - // arrows but let the other navigation characters through -#ifdef __WXMSW__ - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif // __WXMSW__ - private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow) DECLARE_EVENT_TABLE()