X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..a1ae1090eebbc49d8495c3d3464457277af846db:/src/generic/scrlwing.cpp?ds=sidebyside diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index f2c4ba0af7..05e5a0c48c 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -1202,21 +1202,6 @@ BEGIN_EVENT_TABLE(wxGenericScrolledWindow, wxPanel) EVT_PAINT(wxGenericScrolledWindow::OnPaint) END_EVENT_TABLE() -wxGenericScrolledWindow::wxGenericScrolledWindow() : wxScrollHelper(this) -{ -} - -wxGenericScrolledWindow::wxGenericScrolledWindow(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxScrollHelper(this) -{ - Create(parent, winid, pos, size, style, name); -} - bool wxGenericScrolledWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -1272,12 +1257,12 @@ void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event) } #ifdef __WXMSW__ -long +WXLRESULT wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - long rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam); + WXLRESULT rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam); #ifndef __WXWINCE__ // we need to process arrows ourselves for scrolling @@ -1292,24 +1277,6 @@ wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg, #endif // __WXMSW__ -// ---------------------------------------------------------------------------- -// wxScrolledWindow implementation -// ---------------------------------------------------------------------------- - -wxScrolledWindow::wxScrolledWindow() -{ -} - -wxScrolledWindow::wxScrolledWindow(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxGenericScrolledWindow(parent, winid, pos, size, style, name) -{ -} - #endif // !wxGTK // vi:sts=4:sw=4:et