Added compatibility file

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 643db6adf56f75fed113804543550bcb4b2f0330..6ffcaea012b9827bec575611f260bcc6d0c7315c 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -152,6 +152,7 @@ void wxWindowBase::InitBase()
     m_constraints = (wxLayoutConstraints *) NULL;
     m_constraintsInvolvedIn = (wxWindowList *) NULL;
     m_windowSizer = (wxSizer *) NULL;
     m_constraints = (wxLayoutConstraints *) NULL;
     m_constraintsInvolvedIn = (wxWindowList *) NULL;
     m_windowSizer = (wxSizer *) NULL;

+    m_containingSizer = (wxSizer *) NULL;

     m_autoLayout = FALSE;
 #endif // wxUSE_CONSTRAINTS
 
     m_autoLayout = FALSE;
 #endif // wxUSE_CONSTRAINTS
 


@@ -257,6 +258,9 @@ wxWindowBase::~wxWindowBase()
         m_constraints = NULL;
     }
 
         m_constraints = NULL;
     }
 

+    if ( m_containingSizer )
+        m_containingSizer->Remove((wxWindow*)this);
+

     if ( m_windowSizer )
         delete m_windowSizer;
 
     if ( m_windowSizer )
         delete m_windowSizer;
 


@@ -1704,7 +1708,11 @@ void wxWindowBase::CaptureMouse()
     wxWindow *winOld = GetCapture();
     if ( winOld )
     {
     wxWindow *winOld = GetCapture();
     if ( winOld )
     {

+       // I think this is correct, but not compatible with some ports
+#if defined(__WXX11__) || defined(__WXMGL__)

        ((wxWindowBase*) winOld)->DoReleaseMouse();
        ((wxWindowBase*) winOld)->DoReleaseMouse();

+#endif
+       

         // save it on stack
         wxWindowNext *item = new wxWindowNext;
         item->win = winOld;
         // save it on stack
         wxWindowNext *item = new wxWindowNext;
         item->win = winOld;


@@ -1726,8 +1734,13 @@ void wxWindowBase::ReleaseMouse()
 
     if ( ms_winCaptureNext )
     {
 
     if ( ms_winCaptureNext )
     {

+       // I think this is correct, but not compatible with some ports
+#if defined(__WXX11__) || defined(__WXMGL__)

         ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();
         ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();

-
+#else
+        ms_winCaptureNext->win->CaptureMouse();
+#endif
+       

         wxWindowNext *item = ms_winCaptureNext;
         ms_winCaptureNext = item->next;
         delete item;
         wxWindowNext *item = ms_winCaptureNext;
         ms_winCaptureNext = item->next;
         delete item;