WS_CLIPCHILDREN is not always enabled in wxNotebook (caused painting problems).

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 297d81e8fbf7cd02f57744fa5e39688186cd8147..bcbd6f38ff73f5a7c6bb85292e62a746d437cd49 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -21,13 +21,16 @@
 #endif
 
 #ifndef WX_PRECOMP
+#include "wx/event.h"
 #include "wx/app.h"
 #include "wx/dcclient.h"
 #endif
 
+#include "wx/control.h"
+
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
 #include <commctrl.h>
 #endif
 
@@ -50,6 +53,7 @@ wxControl::wxControl(void)
   m_backgroundColour = *wxWHITE;
   m_foregroundColour = *wxBLACK;
   m_callback = 0;
+//  m_windowCursor = wxNullCursor; // To avoid the standard cursor being used
 }
 
 wxControl::~wxControl(void)
@@ -61,7 +65,7 @@ wxControl::~wxControl(void)
   wxWindow *parent = (wxWindow *)GetParent();
   if (parent)
   {
-    if (parent->GetDefaultItem() == this)
+    if (parent->GetDefaultItem() == (wxButton*) this)
         parent->SetDefaultItem(NULL);
   }
 }
@@ -180,13 +184,8 @@ void wxControl::MSWOnMouseMove(int x, int y, WXUINT flags)
     Default();
 }
 
-long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
-}
-
 bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
-                          WXLPARAM* WXUNUSED(result))
+                          WXLPARAM* result)
 {
 #if defined(__WIN95__)
        wxCommandEvent event(wxEVT_NULL, m_windowId);
@@ -237,7 +236,7 @@ bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
                }
 */
                default:
-                       return FALSE;
+            return wxWindow::MSWNotify(wParam, lParam, result);
        }
 
     event.SetEventType(eventType);