fatal bug in wxSplitPath fixed

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index ea72d9e9f3b5726f0757d8d46c57626b9995d4f4..ce7b2fca18b6f4c5dfca6a4d06a4ce56bace7879 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -30,8 +30,8 @@
 
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-#include <commctrl.h>
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+    #include <commctrl.h>
 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
@@ -204,10 +204,9 @@ bool wxControl::MSWOnNotify(int idCtrl,
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {
-    // In general, you don't want to erase the background of a control,
-    // or you'll get a flicker.
-    // TODO: move this 'null' function into each control that
-    // might flicker.
+    // notice that this 'dumb' implementation may cause flicker for some of the
+    // controls in which case they should intercept wxEraseEvent and process it
+    // themselves somehow
 
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);