X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89c20ac15cdcff42502723c0b52ba0e37a8c6275..7a23b2e6970523ea6d4eb836a58e34387ef99d37:/src/common/sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index c34e516932..a882c510d2 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -10,7 +10,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "sizer.h"
 #endif
 
@@ -43,7 +43,38 @@ IMPLEMENT_CLASS(wxNotebookSizer, wxSizer)
 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 
-
+/*
+	TODO PROPERTIES
+	  sizeritem
+	    object
+		object_ref
+		  minsize
+		  option
+		  flag
+		  border
+     spacer
+		option
+		flag
+		borfder
+	boxsizer
+	   orient
+    staticboxsizer
+	   orient
+	   label
+	gridsizer
+	   rows
+	   cols
+	   vgap
+	   hgap
+	flexgridsizer
+	   rows
+	   cols
+	   vgap
+	   hgap
+	   growablerows
+	   growablecols
+    minsize
+*/
 //---------------------------------------------------------------------------
 // wxSizerItem
 //---------------------------------------------------------------------------
@@ -94,10 +125,16 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
 
 wxSizerItem::~wxSizerItem()
 {
-    if (m_userData)
-        delete m_userData;
-    if (m_sizer)
+    delete m_userData;
+
+    if ( m_window )
+    {
+        m_window->SetContainingSizer(NULL);
+    }
+    else // we must be a sizer
+    {
         delete m_sizer;
+    }
 }