Compilation fixes for wx{X11,GTK1,Motif} after making ref data non copyable.

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index fdf018eae760f3132d2a1deb0c94b79db8ad31e2..959ba220a81b668e69d236fac86000b017745181 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1319,6 +1319,7 @@ wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
       m_vgap( vgap ),
       m_hgap( hgap )
 {
       m_vgap( vgap ),
       m_hgap( hgap )
 {

+    wxASSERT(cols >= 0);

 }
 
 wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
 }
 
 wxGridSizer::wxGridSizer( int cols, const wxSize& gap )


@@ -1327,6 +1328,7 @@ wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {

+    wxASSERT(cols >= 0);

 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )


@@ -1335,6 +1337,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
       m_vgap( vgap ),
       m_hgap( hgap )
 {
       m_vgap( vgap ),
       m_hgap( hgap )
 {

+    wxASSERT(rows >= 0 && cols >= 0);

 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )


@@ -1343,6 +1346,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {

+    wxASSERT(rows >= 0 && cols >= 0);

 }
 
 wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)
 }
 
 wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)


@@ -2568,12 +2572,9 @@ void wxStdDialogButtonSizer::Realize()
         Add(12, 40);
 #elif defined(__WXGTK20__)
         // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
         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]
         //
         //      [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
 
         // Flags ensuring that margins between the buttons are 6 pixels.
         const wxSizerFlags


@@ -2585,30 +2586,20 @@ void wxStdDialogButtonSizer::Realize()
         if (m_buttonHelp)
             Add(m_buttonHelp, flagsBtn);
 
         if (m_buttonHelp)
             Add(m_buttonHelp, flagsBtn);
 

-        // extra whitespace between help and cancel/ok buttons
+        // Align the rest of the buttons to the right.

         AddStretchSpacer();
 
         if (m_buttonNegative)
             Add(m_buttonNegative, flagsBtn);
 
         if (m_buttonApply)
         AddStretchSpacer();
 
         if (m_buttonNegative)
             Add(m_buttonNegative, flagsBtn);
 
         if (m_buttonApply)

-        {

             Add(m_buttonApply, flagsBtn);
 
             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);
-        }
-        else // No [Apply]
-        {
-            if (m_buttonAffirmative)
-                Add(m_buttonAffirmative, flagsBtn);
-
-            if (m_buttonCancel)
-                Add(m_buttonCancel, flagsBtn);
-        }
+        if (m_buttonAffirmative)
+            Add(m_buttonAffirmative, flagsBtn);

 
         // Ensure that the right margin is 12 as well.
         AddSpacer(9);
 
         // Ensure that the right margin is 12 as well.
         AddSpacer(9);