no real change: put event handlers together at the end of the file

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 3cd52cb4ae1d5c4c8b2ecdca143aea13d81ceb46..173a0a48106109f8a2e42dfd14d2bb57f511ffed 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -481,8 +481,18 @@ void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ )
 
         case Item_Window:
         {
 
         case Item_Window:
         {

+            // Use wxSIZE_FORCE_EVENT here since a sizer item might
+            // have changed alignment or some other property which would
+            // not change the size of the window. In such a case, no
+            // wxSizeEvent would normally be generated and thus the
+            // control wouldn't get layed out correctly here.
+#if 1

             m_window->SetSize(pos.x, pos.y, size.x, size.y,
                               wxSIZE_ALLOW_MINUS_ONE|wxSIZE_FORCE_EVENT );
             m_window->SetSize(pos.x, pos.y, size.x, size.y,
                               wxSIZE_ALLOW_MINUS_ONE|wxSIZE_FORCE_EVENT );

+#else
+            m_window->SetSize(pos.x, pos.y, size.x, size.y,
+                              wxSIZE_ALLOW_MINUS_ONE );
+#endif

             break;
         }
         case Item_Sizer:
             break;
         }
         case Item_Sizer:


@@ -2238,7 +2248,7 @@ void wxStdDialogButtonSizer::Realize()
         }
 
         // Extra space around and at the right
         }
 
         // Extra space around and at the right

-        Add(12, 24);
+        Add(12, 40);

 #elif defined(__WXGTK20__)
         Add(0, 0, 0, wxLEFT, 9);
         if (m_buttonHelp)
 #elif defined(__WXGTK20__)
         Add(0, 0, 0, wxLEFT, 9);
         if (m_buttonHelp)