More small fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h
index c39f5f087393aa0f4cebc4e466fc26654026432c..71521baac7b0e89d67bd9f11a2db951861326cd8 100644 (file)
--- 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 4e77abc4c041022abacd77e9bca2b02e5e7c6ebe..c81459f28265a47f342604159db9c7e2f62a24cb 100644 (file)
--- 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 eed0e8dec5a2809113ae97c156349cf6af90519c..a843fc2f780d706db87d81230f09894e74f98336 100644 (file)
--- 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 6a9750f96f44e180704e44fa5b669da1ae6cbf98..c547765a840ed0c3645d7d86e831206bca6a0208 100644 (file)
--- 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 a139a1bb4b5aa5482a2caff97c2163eb91e728af..9902a4738778f7c071f4aade45b75de041ec9d93 100644 (file)
--- 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 4a27409903d1d9a87d8ffd4f2b32fd95be27095e..6832678bc13f292e08a702ba730e25044a6e308c 100644 (file)
--- 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