X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/349efbaa89b499557d9a26320bcbd9b012aac9d2..10769d8c47c21fe0ec5034726791a5ad4cf19475:/include/wx/generic/scrolwin.h diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index ecf2c8fa26..ce9c0e75de 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -27,7 +27,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; // default scrolled window style #ifndef wxScrolledWindowStyle -#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL) + #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL) #endif // avoid triggering this stupid VC++ warning @@ -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,11 +66,20 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel, virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } + // lay out the window and its children + virtual bool Layout(); + 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() @@ -82,3 +91,4 @@ private: #endif // _WX_GENERIC_SCROLLWIN_H_ +