fix to previous patch: don't crash when saving in 16bpp

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 0ce0b9977a47c83cbb4faf67f62cc2d8cc0a7891..f787a74ffc5e83e447c1da6726e1f408c87a522b 100644 (file)
--- 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_sizer = NULL;
     m_show = true;
     m_userData = NULL;

-    m_zoneRect = wxRect();
+    m_zoneRect = wxRect(0,0,0,0);

 }
 
 void wxSizerItem::Init(const wxSizerFlags& flags)
 }
 
 void wxSizerItem::Init(const wxSizerFlags& flags)


@@ -1666,12 +1666,18 @@ void wxStaticBoxSizer::ShowItems( bool show )
 wxStdDialogButtonSizer::wxStdDialogButtonSizer()
     : wxBoxSizer(wxHORIZONTAL)
 {
 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);
     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;
     // 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;
 
     m_buttonAffirmative = NULL;
     m_buttonApply = NULL;


@@ -1722,7 +1728,7 @@ void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
     m_buttonCancel = button;
 }
 
     m_buttonCancel = button;
 }
 

-void wxStdDialogButtonSizer::Finalise()
+void wxStdDialogButtonSizer::Realize()

 {
 #ifdef __WXMAC__
         Add(0, 0, 0, wxLEFT, 6);
 {
 #ifdef __WXMAC__
         Add(0, 0, 0, wxLEFT, 6);


@@ -1845,7 +1851,7 @@ void wxBookCtrlSizer::RecalcSizes()
 
 wxSize wxBookCtrlSizer::CalcMin()
 {
 
 wxSize wxBookCtrlSizer::CalcMin()
 {

-    wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize());
+    wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0,0));

 
     sizeBorder.x += 5;
     sizeBorder.y += 5;
 
     sizeBorder.x += 5;
     sizeBorder.y += 5;