check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index d0b26df54004b844587eeb9d361cf6e962be4daf..9ff053c5b28425d675f869d6c036b57d84f336be 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -76,7 +76,6 @@ wxSizerXmlHandler::wxSizerXmlHandler()
     XRC_ADD_STYLE(wxALIGN_CENTER_VERTICAL);
     XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
 
     XRC_ADD_STYLE(wxALIGN_CENTER_VERTICAL);
     XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
 

-    XRC_ADD_STYLE(wxADJUST_MINSIZE);

     XRC_ADD_STYLE(wxFIXED_MINSIZE);
 }
 
     XRC_ADD_STYLE(wxFIXED_MINSIZE);
 }
 


@@ -145,9 +144,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."));
 


@@ -171,7 +170,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;
 }


@@ -362,6 +361,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)