wxEmptyString decorations.

[wxWidgets.git] / contrib / src / gizmos / dynamicsash.cpp

diff --git a/contrib/src/gizmos/dynamicsash.cpp b/contrib/src/gizmos/dynamicsash.cpp
index fa9ee2d62287735dbd88566cee899f74ed08e9da..ea93094de6424b0696cdc2acc36734d10e6c2383 100644 (file)
--- a/contrib/src/gizmos/dynamicsash.cpp
+++ b/contrib/src/gizmos/dynamicsash.cpp
@@ -27,6 +27,10 @@
     #include "wx/wx.h"
 #endif
 
+#ifdef __WXMSW__
+#include "wx/mdi.h"
+#endif
+
 #include "wx/gizmos/dynamicsash.h"
 
 
@@ -108,7 +112,7 @@ public:
 
     virtual wxEvent* Clone() const { return new wxDynamicSashReparentEvent(*this); }
 
-    DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent);
+    DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent)
 };
 
 
@@ -452,7 +456,11 @@ wxWindow *wxDynamicSashWindowImpl::FindFrame() const {
     wxWindow *win;
 
     win = m_window->GetParent();
-    while (win && !win->IsTopLevel()) {
+    while (win && !win->IsTopLevel()
+#ifdef __WXMSW__
+           && ! wxIsKindOf(win, wxMDIChildFrame)  // not top-level but still a frame
+#endif
+        ) {
         win = win->GetParent();
     }
 
@@ -1172,7 +1180,7 @@ void wxDynamicSashWindowLeaf::OnScroll(wxScrollEvent &WXUNUSED(event)) {
 }
 
 void wxDynamicSashWindowLeaf::OnFocus(wxFocusEvent &event) {
-    if (event.m_eventObject == m_hscroll || event.m_eventObject == m_vscroll) {
+    if (event.GetEventObject() == m_hscroll || event.GetEventObject() == m_vscroll) {
         m_child->SetFocus();
     }
 }