X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b935bec2368afde72a9451fd431c8039b1194f1f..6bc3b8e9680e8aa3d50ae4bb41dad22c6dd3ce1b:/include/wx/generic/scrolwin.h diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index faf66d635a..fc55e3177b 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -45,7 +45,7 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel, public: wxGenericScrolledWindow() : wxScrollHelper(this) { } wxGenericScrolledWindow(wxWindow *parent, - wxWindowID winid = -1, + wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxScrolledWindowStyle, @@ -79,7 +79,7 @@ protected: // 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); + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); #endif // __WXMSW__ private: