X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a01d6442f4dcf2d30d52e50bc8c8410066f76265..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/common/sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 89eaacb15d..9bc6fcc416 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -840,6 +840,10 @@ bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
 
     wxSizerItem *item = node->GetData();
     node->SetData(newitem);
+
+    if (item->IsWindow() && item->GetWindow())
+        item->GetWindow()->SetContainingSizer(NULL);
+
     delete item;
 
     return true;
@@ -1319,6 +1323,7 @@ wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
       m_vgap( vgap ),
       m_hgap( hgap )
 {
+    wxASSERT(cols >= 0);
 }
 
 wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
@@ -1327,6 +1332,7 @@ wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {
+    wxASSERT(cols >= 0);
 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
@@ -1335,6 +1341,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
       m_vgap( vgap ),
       m_hgap( hgap )
 {
+    wxASSERT(rows >= 0 && cols >= 0);
 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
@@ -1343,6 +1350,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {
+    wxASSERT(rows >= 0 && cols >= 0);
 }
 
 wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)
@@ -2085,7 +2093,7 @@ void wxBoxSizer::RecalcSizes()
 
     // Check for the degenerated case when we don't have enough space for even
     // the min sizes of all the items: in this case we really can't do much
-    // more than to to allocate the min size to as many of fixed size items as
+    // more than to allocate the min size to as many of fixed size items as
     // possible (on the assumption that variable size items such as text zones
     // or list boxes may use scrollbars to show their content even if their
     // size is less than min size but that fixed size items such as buttons
@@ -2389,6 +2397,9 @@ void wxStaticBoxSizer::RecalcSizes()
         // in the wxBoxSizer::RecalcSizes() call below using coordinates relative
         // to the top-left corner of the staticbox:
         m_position.x = m_position.y = 0;
+#elif defined(__WXOSX__) && wxOSX_USE_COCOA
+        // the distance from the 'inner' content view to the embedded controls
+        m_position.x = m_position.y = 10;
 #else
         // if the wxStaticBox has childrens, then these windows must be placed
         // by the wxBoxSizer::RecalcSizes() call below using coordinates relative
@@ -2526,29 +2537,6 @@ void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
     m_buttonCancel = button;
 }
 
-#ifdef __WXGTK20__
-
-namespace
-{
-
-// Returns true only if the button is non-NULL and has the given id and text
-// (possible translated).
-bool IsStdButtonWithStdText(wxButton *btn, wxWindowID id, const char *label)
-{
-    if ( !btn )
-        return false;
-
-    if ( btn->GetId() != id )
-        return false;
-
-    const wxString labelText = btn->GetLabelText();
-    return labelText == label || labelText == wxGetTranslation(label);
-}
-
-} // anonymous namespace
-
-#endif // __WXGTK20__
-
 void wxStdDialogButtonSizer::Realize()
 {
 #ifdef __WXMAC__
@@ -2591,12 +2579,9 @@ void wxStdDialogButtonSizer::Realize()
         Add(12, 40);
 #elif defined(__WXGTK20__)
         // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
-        // describes the margins and the buttons order but basically it is
+        // says that the correct button order is
         //
         //      [Help]                  [Alternative] [Cancel] [Affirmative]
-        //
-        // in general case but, somewhat confusingly, the native message box
-        // uses "No Yes Cancel" with these particular buttons so do we as well.
 
         // Flags ensuring that margins between the buttons are 6 pixels.
         const wxSizerFlags
@@ -2611,31 +2596,17 @@ void wxStdDialogButtonSizer::Realize()
         // Align the rest of the buttons to the right.
         AddStretchSpacer();
 
-        // "No Yes Cancel" is an exception to the general rule according to
-        // which the affirmative buttons goes after "Cancel" so treat it
-        // separately
-        if ( IsStdButtonWithStdText(m_buttonNegative, wxID_NO, "No") &&
-              IsStdButtonWithStdText(m_buttonAffirmative, wxID_YES, "Yes") &&
-               IsStdButtonWithStdText(m_buttonCancel, wxID_CANCEL, "Cancel") )
-        {
+        if (m_buttonNegative)
             Add(m_buttonNegative, flagsBtn);
-            Add(m_buttonAffirmative, flagsBtn);
-            Add(m_buttonCancel, flagsBtn);
-        }
-        else // Use standard layout
-        {
-            if (m_buttonNegative)
-                Add(m_buttonNegative, flagsBtn);
 
-            if (m_buttonApply)
-                Add(m_buttonApply, flagsBtn);
+        if (m_buttonApply)
+            Add(m_buttonApply, flagsBtn);
 
-            if (m_buttonCancel)
-                Add(m_buttonCancel, flagsBtn);
+        if (m_buttonCancel)
+            Add(m_buttonCancel, flagsBtn);
 
-            if (m_buttonAffirmative)
-                Add(m_buttonAffirmative, flagsBtn);
-        }
+        if (m_buttonAffirmative)
+            Add(m_buttonAffirmative, flagsBtn);
 
         // Ensure that the right margin is 12 as well.
         AddSpacer(9);