1. wxDateTimeHolidayAuthority class for calculating the holidays added

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 96415ce65fcd0f63981d7ccac29d79e963b90000..6280097628142767b8f4ea6079b524470ae901ff 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -31,7 +31,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject);
 IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
 IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
+#if wxUSE_NOTEBOOK
 IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer);
+#endif
 
 //---------------------------------------------------------------------------
 // wxSizerItem
@@ -267,6 +269,21 @@ void wxSizer::Prepend( int width, int height, int option, int flag, int border,
     m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) );
 }
 
+void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData )
+{
+    m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) );
+}
+
+void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData )
+{
+    m_children.Insert( before, new wxSizerItem( sizer, option, flag, border, userData ) );
+}
+
+void wxSizer::Insert( int before, int width, int height, int option, int flag, int border, wxObject* userData )
+{
+    m_children.Insert( before, new wxSizerItem( width, height, option, flag, border, userData ) );
+}
+
 bool wxSizer::Remove( wxWindow *window )
 {
     wxASSERT( window );
@@ -396,7 +413,7 @@ void wxBoxSizer::RecalcSizes()
 
        if (m_orient == wxVERTICAL)
        {
-           long height = size.y;
+           wxCoord height = size.y;
            if (item->GetOption())
            {
                height = (delta * weight) + extra;
@@ -421,7 +438,7 @@ void wxBoxSizer::RecalcSizes()
        }
        else
        {
-           long width = size.x;
+           wxCoord width = size.x;
            if (item->GetOption())
            {
                width = (delta * weight) + extra;
@@ -452,7 +469,7 @@ void wxBoxSizer::RecalcSizes()
 wxSize wxBoxSizer::CalcMin()
 {
     if (m_children.GetCount() == 0)
-        return wxSize(2,2);
+        return wxSize(10,10);
 
     m_stretchable = 0;
     m_minWidth = 0;
@@ -553,7 +570,7 @@ wxSize wxStaticBoxSizer::CalcMin()
     int other_border = 5;
 
     wxSize ret( wxBoxSizer::CalcMin() );
-    ret.x += 2*top_border;
+    ret.x += 2*other_border;
     ret.y += other_border + top_border;
 
     return ret;
@@ -563,6 +580,8 @@ wxSize wxStaticBoxSizer::CalcMin()
 // wxNotebookSizer
 //---------------------------------------------------------------------------
 
+#if wxUSE_NOTEBOOK
+
 wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
 {
     wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );
@@ -619,4 +638,4 @@ wxSize wxNotebookSizer::CalcMin()
     return wxSize( borderX + maxX, borderY + maxY );
 }
 
-
+#endif // wxUSE_NOTEBOOK