X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9806a47c30050b2beeb772f69d4cef4a20dc8745..59840ba3b16e4baf3228dd79c6b7ae40b55cf488:/include/wx/generic/scrolwin.h diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index a8f180e034..5e092a91a9 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -42,7 +42,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel, public wxScrollHelper { - public: +public: wxGenericScrolledWindow() : wxScrollHelper(this) { } wxGenericScrolledWindow(wxWindow *parent, wxWindowID id = -1, @@ -66,8 +66,20 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel, virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } +protected: + // this is needed for wxEVT_PAINT processing hack described in + // 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 long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); +#endif // __WXMSW__ + private: DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow) + DECLARE_EVENT_TABLE() }; #ifdef __VISUALC__