X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2997ca30d66c2dc778ed9a84c8c94fea6ec1c958..dc683654a1af7f02ee87623a713a7147bcb6dd84:/src/common/sizer.cpp?ds=inline

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 0ce0b9977a..f787a74ffc 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -99,7 +99,7 @@ void wxSizerItem::Init()
     m_sizer = NULL;
     m_show = true;
     m_userData = NULL;
-    m_zoneRect = wxRect();
+    m_zoneRect = wxRect(0,0,0,0);
 }
 
 void wxSizerItem::Init(const wxSizerFlags& flags)
@@ -1666,12 +1666,18 @@ void wxStaticBoxSizer::ShowItems( bool show )
 wxStdDialogButtonSizer::wxStdDialogButtonSizer()
     : wxBoxSizer(wxHORIZONTAL)
 {
+    // Vertical buttons with lots of space on either side
+    // looks rubbish on WinCE, so let's not do this for now.
+    // If we are going to use vertical buttons, we should
+    // put the sizer to the right of other controls in the dialog,
+    // and that's beyond the scope of this sizer.
+#ifndef __WXWINCE__
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
-
     // If we have a PDA screen, put yes/no button over
     // all other buttons, otherwise on the left side.
     if (is_pda)
         m_orient = wxVERTICAL;
+#endif
 
     m_buttonAffirmative = NULL;
     m_buttonApply = NULL;
@@ -1722,7 +1728,7 @@ void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
     m_buttonCancel = button;
 }
 
-void wxStdDialogButtonSizer::Finalise()
+void wxStdDialogButtonSizer::Realize()
 {
 #ifdef __WXMAC__
         Add(0, 0, 0, wxLEFT, 6);
@@ -1845,7 +1851,7 @@ void wxBookCtrlSizer::RecalcSizes()
 
 wxSize wxBookCtrlSizer::CalcMin()
 {
-    wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize());
+    wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0,0));
 
     sizeBorder.x += 5;
     sizeBorder.y += 5;