Compile fix.

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

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index 595a0a5629cebf58c3aa124b84e900c6351d6c6a..a985e385cfa68834c60439e5a0343d512c64d0fa 100644 (file)
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -32,6 +32,10 @@
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 

+#ifdef __WXMSW__
+#include "wx/msw/private.h"
+#endif
+

 IMPLEMENT_CLASS( wxFloatingPane, wxFloatingPaneBaseClass )
 
 wxFloatingPane::wxFloatingPane(wxWindow* parent,
 IMPLEMENT_CLASS( wxFloatingPane, wxFloatingPaneBaseClass )
 
 wxFloatingPane::wxFloatingPane(wxWindow* parent,


@@ -56,17 +60,21 @@ wxFloatingPane::wxFloatingPane(wxWindow* parent,
     
     // find out if the system supports solid window drag.
     // on non-msw systems, this is assumed to be the case
     
     // find out if the system supports solid window drag.
     // on non-msw systems, this is assumed to be the case

-    #ifdef __WXMSW__
-    BOOL b = TRUE;
+#ifdef __WXMSW__
+    bool b = TRUE;

     SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0);
     m_solid_drag = b ? true : false;
     SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0);
     m_solid_drag = b ? true : false;

-    #endif
+#endif

     
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);
 }
 
 wxFloatingPane::~wxFloatingPane()
 {
     
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);
 }
 
 wxFloatingPane::~wxFloatingPane()
 {

+    // if we do not do this, then we can crash...
+    if(m_owner_mgr && m_owner_mgr->m_action_window == this) {
+        m_owner_mgr->m_action_window = NULL;
+    }

     m_mgr.UnInit();
 }
 
     m_mgr.UnInit();
 }