added #if wxUSE_CLIPBOARD

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 48ebd0014b1d73400db164671b9c4c388442d57c..96415ce65fcd0f63981d7ccac29d79e963b90000 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -23,6 +23,7 @@
 #include "wx/sizer.h"
 #include "wx/utils.h"
 #include "wx/statbox.h"
 #include "wx/sizer.h"
 #include "wx/utils.h"
 #include "wx/statbox.h"

+#include "wx/notebook.h"

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -30,6 +31,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject);
 IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
 IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
 IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);

+IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer);

 
 //---------------------------------------------------------------------------
 // wxSizerItem
 
 //---------------------------------------------------------------------------
 // wxSizerItem


@@ -48,6 +50,8 @@ wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int borde
     m_minSize.x = width;
     m_minSize.y = height;
 
     m_minSize.x = width;
     m_minSize.y = height;
 

+    SetRatio(width, height);
+

     // size is set directly
     m_size = m_minSize;
 }
     // size is set directly
     m_size = m_minSize;
 }


@@ -64,6 +68,9 @@ wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wx
     // minimal size is the initial size
     m_minSize = window->GetSize();
 
     // minimal size is the initial size
     m_minSize = window->GetSize();
 

+    // aspect ratio calculated from initial size
+    SetRatio(m_minSize);
+

     // size is calculated later
     // m_size = ...
 }
     // size is calculated later
     // m_size = ...
 }


@@ -79,6 +86,7 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxOb
 
     // minimal size is calculated later
     // m_minSize = ...
 
     // minimal size is calculated later
     // m_minSize = ...

+    m_ratio = 0;

 
     // size is calculated later
     // m_size = ...
 
     // size is calculated later
     // m_size = ...


@@ -119,7 +127,13 @@ wxSize wxSizerItem::CalcMin()
 {
     wxSize ret;
     if (IsSizer())
 {
     wxSize ret;
     if (IsSizer())

+    {

         ret = m_sizer->CalcMin();
         ret = m_sizer->CalcMin();

+        // if we have to preserve aspect ratio _AND_ this is
+        // the first-time calculation, consider ret to be initial size
+        if ((m_flag & wxSHAPED) && !m_ratio) SetRatio(ret);
+    }
+

 /*
     The minimum size of a window should be the
     initial size, as saved in m_minSize, not the
 /*
     The minimum size of a window should be the
     initial size, as saved in m_minSize, not the


@@ -163,6 +177,28 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
     {
         size.y -= m_border;
     }
     {
         size.y -= m_border;
     }

+    if (m_flag & wxSHAPED) {
+        // adjust aspect ratio
+        int rwidth = (int) (size.y * m_ratio);
+        if (rwidth > size.x) {
+            // fit horizontally
+            int rheight = (int) (size.x / m_ratio);
+            // add vertical space
+            if (m_flag & wxALIGN_CENTER_VERTICAL)
+                pos.y += (size.y - rheight) / 2;
+            else if (m_flag & wxALIGN_BOTTOM)
+                pos.y += (size.y - rheight);
+            // use reduced dimensions
+            size.y =rheight;
+        } else if (rwidth < size.x) {
+            // add horizontal space
+            if (m_flag & wxALIGN_CENTER_HORIZONTAL)
+                pos.x += (size.x - rwidth) / 2;
+            else if (m_flag & wxALIGN_RIGHT)
+                pos.x += (size.x - rwidth);
+            size.x = rwidth;
+        }
+    }

 
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
 
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );


@@ -370,12 +406,14 @@ void wxBoxSizer::RecalcSizes()
            wxPoint child_pos( pt );
            wxSize  child_size( wxSize( size.x, height) );
 
            wxPoint child_pos( pt );
            wxSize  child_size( wxSize( size.x, height) );
 

-           if (item->GetFlag() & wxALIGN_RIGHT)
+           if (item->GetFlag() & (wxEXPAND | wxSHAPED))
+             child_size.x = m_size.x;
+           else if (item->GetFlag() & wxALIGN_RIGHT)

              child_pos.x += m_size.x - size.x;
              child_pos.x += m_size.x - size.x;

-           else if (item->GetFlag() & wxCENTER)
+           else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL))
+             // XXX wxCENTER is added for backward compatibility;
+             //     wxALIGN_CENTER should be used in new code

              child_pos.x += (m_size.x - size.x) / 2;
              child_pos.x += (m_size.x - size.x) / 2;

-           else if (item->GetFlag() & wxEXPAND)
-             child_size.x = m_size.x;

 
            item->SetDimension( child_pos, child_size );
 
 
            item->SetDimension( child_pos, child_size );
 


@@ -393,12 +431,14 @@ void wxBoxSizer::RecalcSizes()
            wxPoint child_pos( pt );
            wxSize  child_size( wxSize(width, size.y) );
 
            wxPoint child_pos( pt );
            wxSize  child_size( wxSize(width, size.y) );
 

-           if (item->GetFlag() & wxALIGN_BOTTOM)
+           if (item->GetFlag() & (wxEXPAND | wxSHAPED))
+             child_size.y = m_size.y;
+           else if (item->GetFlag() & wxALIGN_BOTTOM)

              child_pos.y += m_size.y - size.y;
              child_pos.y += m_size.y - size.y;

-           else if (item->GetFlag() & wxCENTER)
+           else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL))
+             // XXX wxCENTER is added for backward compatibility;
+             //     wxALIGN_CENTER should be used in new code

              child_pos.y += (m_size.y - size.y) / 2;
              child_pos.y += (m_size.y - size.y) / 2;

-           else if (item->GetFlag() & wxEXPAND)
-             child_size.y = m_size.y;

 
            item->SetDimension( child_pos, child_size );
 
 
            item->SetDimension( child_pos, child_size );
 


@@ -473,7 +513,7 @@ wxSize wxBoxSizer::CalcMin()
 wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
   : wxBoxSizer( orient )
 {
 wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
   : wxBoxSizer( orient )
 {

-    wxASSERT_MSG( box, T("wxStaticBoxSizer needs a static box") );
+    wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") );

 
     m_staticBox = box;
 }
 
     m_staticBox = box;
 }


@@ -504,9 +544,10 @@ void wxStaticBoxSizer::RecalcSizes()
 
 wxSize wxStaticBoxSizer::CalcMin()
 {
 
 wxSize wxStaticBoxSizer::CalcMin()
 {

-    // this will have to be done platform by platform
+    // This will have to be done platform by platform

     // as there is no way to guess the thickness of
     // as there is no way to guess the thickness of

-    // a wxStaticBox border
+    // a wxStaticBox border.
+    

     int top_border = 15;
     if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
     int other_border = 5;
     int top_border = 15;
     if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
     int other_border = 5;


@@ -517,3 +558,65 @@ wxSize wxStaticBoxSizer::CalcMin()
 
     return ret;
 }
 
     return ret;
 }

+
+//---------------------------------------------------------------------------
+// wxNotebookSizer
+//---------------------------------------------------------------------------
+
+wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
+{
+    wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );
+    
+    m_notebook = nb;
+}
+
+void wxNotebookSizer::RecalcSizes()
+{
+    m_notebook->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
+}
+
+wxSize wxNotebookSizer::CalcMin()
+{
+    // This will have to be done platform by platform
+    // as there is no way to guess the thickness of
+    // the wxNotebook tabs and border.
+    
+    int borderX = 5;
+    int borderY = 5;
+    if ((m_notebook->HasFlag(wxNB_RIGHT)) ||
+        (m_notebook->HasFlag(wxNB_LEFT)))
+    {
+        borderX += 70; // improvements later..
+    }
+    else
+    {
+        borderY += 35; // improvements later..
+    }
+    
+    if (m_notebook->GetChildren().GetCount() == 0)
+        return wxSize(borderX + 10, borderY + 10);
+
+    int maxX = 0;
+    int maxY = 0;
+
+    wxWindowList::Node *node = m_notebook->GetChildren().GetFirst();
+    while (node)
+    {
+        wxWindow *item = node->GetData();
+       wxSizer *itemsizer = item->GetSizer();
+       
+       if (itemsizer)
+       {
+            wxSize subsize( itemsizer->CalcMin() );
+       
+           if (subsize.x > maxX) maxX = subsize.x;
+           if (subsize.y > maxY) maxY = subsize.y;
+       }
+
+       node = node->GetNext();
+    }
+
+    return wxSize( borderX + maxX, borderY + maxY );
+}
+
+