minimize searching for tlw parent, remove useless code

[wxWidgets.git] / src / xrc / xh_sizer.cpp

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index b77b9a5cfe9f1bfcd71d1ed8286bba33f2d8f2ca..f5e2dcc46616ba1825cf0c0f6fe36b0c96b4818c 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -27,6 +27,7 @@
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/button.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/button.h"

+    #include "wx/scrolwin.h"

 #endif
 
 #include "wx/gbsizer.h"
 #endif
 
 #include "wx/gbsizer.h"


@@ -77,6 +78,7 @@ wxSizerXmlHandler::wxSizerXmlHandler()
     XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
 
     XRC_ADD_STYLE(wxFIXED_MINSIZE);
     XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
 
     XRC_ADD_STYLE(wxFIXED_MINSIZE);

+    XRC_ADD_STYLE(wxRESERVE_SPACE_EVEN_IF_HIDDEN);

 }
 
 
 }
 
 


@@ -144,9 +146,9 @@ wxObject* wxSizerXmlHandler::Handle_sizeritem()
         wxWindow *wnd = wxDynamicCast(item, wxWindow);
 
         if (sizer)
         wxWindow *wnd = wxDynamicCast(item, wxWindow);
 
         if (sizer)

-            sitem->SetSizer(sizer);
+            sitem->AssignSizer(sizer);

         else if (wnd)
         else if (wnd)

-            sitem->SetWindow(wnd);
+            sitem->AssignWindow(wnd);

         else
             wxLogError(wxT("Error in resource."));
 
         else
             wxLogError(wxT("Error in resource."));
 


@@ -170,7 +172,7 @@ wxObject* wxSizerXmlHandler::Handle_spacer()
 
     wxSizerItem* sitem = MakeSizerItem();
     SetSizerItemAttributes(sitem);
 
     wxSizerItem* sitem = MakeSizerItem();
     SetSizerItemAttributes(sitem);

-    sitem->SetSpacer(GetSize());
+    sitem->AssignSpacer(GetSize());

     AddSizerItem(sitem);
     return NULL;
 }
     AddSizerItem(sitem);
     return NULL;
 }


@@ -236,11 +238,22 @@ wxObject* wxSizerXmlHandler::Handle_sizer()
         wxXmlNode *nd = m_node;
         m_node = parentNode;
         if (GetSize() == wxDefaultSize)
         wxXmlNode *nd = m_node;
         m_node = parentNode;
         if (GetSize() == wxDefaultSize)

-            sizer->Fit(m_parentAsWindow);
+        {
+            if ( wxDynamicCast(m_parentAsWindow, wxScrolledWindow) != NULL )
+            {
+                sizer->FitInside(m_parentAsWindow);
+            }
+            else
+            {
+                sizer->Fit(m_parentAsWindow);
+            }
+        }

         m_node = nd;
 
         m_node = nd;
 

-        if (m_parentAsWindow->GetWindowStyle() & (wxMAXIMIZE_BOX | wxRESIZE_BORDER))
+        if (m_parentAsWindow->IsTopLevel())
+        {

             sizer->SetSizeHints(m_parentAsWindow);
             sizer->SetSizeHints(m_parentAsWindow);

+        }

     }
 
     return sizer;
     }
 
     return sizer;


@@ -361,6 +374,9 @@ void wxSizerXmlHandler::SetSizerItemAttributes(wxSizerItem* sitem)
         gbsitem->SetPos(GetGBPos(wxT("cellpos")));
         gbsitem->SetSpan(GetGBSpan(wxT("cellspan")));
     }
         gbsitem->SetPos(GetGBPos(wxT("cellpos")));
         gbsitem->SetSpan(GetGBSpan(wxT("cellspan")));
     }

+
+    // record the id of the item, if any, for use by XRCSIZERITEM()
+    sitem->SetId(GetID());

 }
 
 void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)
 }
 
 void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)