GetMenuBar() now traverses up the hierarchy so it no longer has to be done here.

[wxWidgets.git] / src / generic / scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index f2c4ba0af70be8e3d4e797d103ba8ae8f1ced66b..05e5a0c48c246675a7b7ed2d60746aab18452721 100644 (file)
--- 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()
 
     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,
 bool wxGenericScrolledWindow::Create(wxWindow *parent,
                               wxWindowID id,
                               const wxPoint& pos,


@@ -1272,12 +1257,12 @@ void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
 }
 
 #ifdef __WXMSW__
 }
 
 #ifdef __WXMSW__

-long
+WXLRESULT

 wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
                                        WXWPARAM wParam,
                                        WXLPARAM lParam)
 {
 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
 
 #ifndef __WXWINCE__
     // we need to process arrows ourselves for scrolling


@@ -1292,24 +1277,6 @@ wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
 
 #endif // __WXMSW__
 
 
 #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
 #endif // !wxGTK
 
 // vi:sts=4:sw=4:et