explicit scrollbar style flags needed

[wxWidgets.git] / src / univ / winuniv.cpp

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index ab3d6514b813b4c6a5c55b55d7672bb2ce594d8c..7b6895d5014ab693dc9ac11151d46e9da7d1fc03 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -101,22 +101,6 @@ END_EVENT_TABLE()
 // creation
 // ----------------------------------------------------------------------------
 
-wxWindow::wxWindow()
-{
-    Init();
-}
-
-wxWindow::wxWindow(wxWindow *parent,
-                   wxWindowID id,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   long style,
-                   const wxString& name)
-                   : wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name)
-{
-    Init();
-}
-
 void wxWindow::Init()
 {
     m_scrollbarVert =
@@ -227,7 +211,7 @@ const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
 // ----------------------------------------------------------------------------
 
 // the event handlers executed when the window must be repainted
-void wxWindow::OnNcPaint(wxPaintEvent& WXUNUSED(event))
+void wxWindow::OnNcPaint(wxNcPaintEvent& WXUNUSED(event))
 {
     if ( m_renderer )
     {
@@ -1355,7 +1339,7 @@ void wxWindow::OnKeyUp(wxKeyEvent& event)
 
 #include "wx/msw/private.h"
 
-long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     if ( message == WM_NCHITTEST )
     {