From 606b005fb2b535b34d1ca45d2d06ee86718e8b1c Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 27 Jun 2001 12:31:16 +0000
Subject: [PATCH] More small fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 contrib/samples/ogl/ogledit/doc.h | 1 +
 contrib/samples/ogl/studio/doc.h  | 1 +
 samples/docview/doc.h             | 1 +
 src/generic/grid.cpp              | 2 ++
 src/wxvc.dsp                      | 4 ++++
 src/wxvc_dll.dsp                  | 4 ++++
 6 files changed, 13 insertions(+)

diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h
index c39f5f0873..71521baac7 100644
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -17,6 +17,7 @@
 #endif
 
 #include <wx/docview.h>
+#include <wx/cmdproc.h>
 #include <wx/string.h>
 #include <wx/wxexpr.h>
 
diff --git a/contrib/samples/ogl/studio/doc.h b/contrib/samples/ogl/studio/doc.h
index 4e77abc4c0..c81459f282 100644
--- a/contrib/samples/ogl/studio/doc.h
+++ b/contrib/samples/ogl/studio/doc.h
@@ -17,6 +17,7 @@
 #endif
 
 #include <wx/docview.h>
+#include <wx/cmdproc.h>
 #include <wx/string.h>
 #include <wx/wxexpr.h>
 
diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index eed0e8dec5..a843fc2f78 100644
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -17,6 +17,7 @@
 #define __DOCSAMPLEH__
 
 #include "wx/docview.h"
+#include "wx/cmdproc.h"
 
 // Plots a line from one point to the other
 class DoodleLine: public wxObject
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6a9750f96f..c547765a84 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3503,6 +3503,8 @@ wxGrid::wxGrid( wxWindow *parent,
 
 wxGrid::~wxGrid()
 {
+    // Must do this or ~wxScrollHelper will pop the wrong event handler
+    SetTargetWindow(this);
     ClearAttrCache();
     wxSafeDecRef(m_defaultCellAttr);
 
diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index a139a1bb4b..9902a47387 100644
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -101,6 +101,10 @@ SOURCE=.\common\cmdline.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\cmdproc.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cmndata.cpp
 # End Source File
 # Begin Source File
diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 4a27409903..6832678bc1 100644
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -104,6 +104,10 @@ SOURCE=.\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\cmdproc.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cmdline.cpp
 # End Source File
 # Begin Source File
-- 
2.45.2