PCX handler now working for reading (8bit and 24bit images).

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 5a004dd535fe6a2ff63c3bd89c3e30798e1d1654..fcac0711a7b3d4454412277f893c1afb18a2807a 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.cpp

-// Purpose:     provide wxNewSizer class for layounting
+// Purpose:     provide new wxSizer class for layounting

 // Author:      Robert Roebling and Robin Dunn
 // Modified by:
 // Created:     
 // Author:      Robert Roebling and Robin Dunn
 // Modified by:
 // Created:     


@@ -22,15 +22,16 @@
 
 #include "wx/sizer.h"
 #include "wx/utils.h"
 
 #include "wx/sizer.h"
 #include "wx/utils.h"

+#include "wx/statbox.h"

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

-// wxNewSizerItem
+// wxSizerItem

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

-wxNewSizerItem::wxNewSizerItem( int width, int height, int option, int flag, int border )
+wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border )

 {
     m_window = (wxWindow *) NULL;
 {
     m_window = (wxWindow *) NULL;

-    m_sizer = (wxNewSizer *) NULL;
+    m_sizer = (wxSizer *) NULL;

     m_option = option;
     m_border = border;
     m_flag = flag;
     m_option = option;
     m_border = border;
     m_flag = flag;


@@ -43,10 +44,10 @@ wxNewSizerItem::wxNewSizerItem( int width, int height, int option, int flag, int
     m_size = m_minSize;
 }
 
     m_size = m_minSize;
 }
 

-wxNewSizerItem::wxNewSizerItem( wxWindow *window, int option, int flag, int border )
+wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border )

 {
     m_window = window;
 {
     m_window = window;

-    m_sizer = (wxNewSizer *) NULL;
+    m_sizer = (wxSizer *) NULL;

     m_option = option;
     m_border = border;
     m_flag = flag;
     m_option = option;
     m_border = border;
     m_flag = flag;


@@ -58,7 +59,7 @@ wxNewSizerItem::wxNewSizerItem( wxWindow *window, int option, int flag, int bord
     // m_size = ...
 }
 
     // m_size = ...
 }
 

-wxNewSizerItem::wxNewSizerItem( wxNewSizer *sizer, int option, int flag, int border )
+wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border )

 {
     m_window = (wxWindow *) NULL;
     m_sizer = sizer;
 {
     m_window = (wxWindow *) NULL;
     m_sizer = sizer;


@@ -73,10 +74,10 @@ wxNewSizerItem::wxNewSizerItem( wxNewSizer *sizer, int option, int flag, int bor
     // m_size = ...
 }
 
     // m_size = ...
 }
 

-wxSize wxNewSizerItem::GetSize()
+wxSize wxSizerItem::GetSize()

 {
     wxSize ret;
 {
     wxSize ret;

-    if (IsNewSizer())
+    if (IsSizer())

         ret = m_sizer->GetSize();
     else
     if (IsWindow())
         ret = m_sizer->GetSize();
     else
     if (IsWindow())


@@ -95,10 +96,10 @@ wxSize wxNewSizerItem::GetSize()
     return ret;
 }
 
     return ret;
 }
 

-wxSize wxNewSizerItem::CalcMin()
+wxSize wxSizerItem::CalcMin()

 {
     wxSize ret;
 {
     wxSize ret;

-    if (IsNewSizer())
+    if (IsSizer())

         ret = m_sizer->CalcMin();
 /*  
     The minimum size of a window should be the
         ret = m_sizer->CalcMin();
 /*  
     The minimum size of a window should be the


@@ -123,7 +124,7 @@ wxSize wxNewSizerItem::CalcMin()
     return ret;
 }
 
     return ret;
 }
 

-void wxNewSizerItem::SetDimension( wxPoint pos, wxSize size )
+void wxSizerItem::SetDimension( wxPoint pos, wxSize size )

 {
     if (m_flag & wxWEST)
     {
 {
     if (m_flag & wxWEST)
     {


@@ -144,7 +145,7 @@ void wxNewSizerItem::SetDimension( wxPoint pos, wxSize size )
         size.y -= m_border;
     }
        
         size.y -= m_border;
     }
        

-    if (IsNewSizer())
+    if (IsSizer())

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


@@ -153,67 +154,130 @@ void wxNewSizerItem::SetDimension( wxPoint pos, wxSize size )
     m_size = size;
 }
 
     m_size = size;
 }
 

-bool wxNewSizerItem::IsWindow()
+bool wxSizerItem::IsWindow()

 {
     return (m_window != NULL);
 }
 
 {
     return (m_window != NULL);
 }
 

-bool wxNewSizerItem::IsNewSizer()
+bool wxSizerItem::IsSizer()

 {
     return (m_sizer != NULL);
 }
 
 {
     return (m_sizer != NULL);
 }
 

-bool wxNewSizerItem::IsSpacer()
+bool wxSizerItem::IsSpacer()

 {
     return (m_window == NULL) && (m_sizer == NULL);
 }
 
 //---------------------------------------------------------------------------
 {
     return (m_window == NULL) && (m_sizer == NULL);
 }
 
 //---------------------------------------------------------------------------

-// wxNewSizer
+// wxSizer

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

-wxNewSizer::wxNewSizer()
+wxSizer::wxSizer()

 {
     m_children.DeleteContents( TRUE );
 }
 
 {
     m_children.DeleteContents( TRUE );
 }
 

-wxNewSizer::~wxNewSizer()
+wxSizer::~wxSizer()

 {
 }
    
 {
 }
    

-void wxNewSizer::Add( wxWindow *window, int option, int flag, int border )
+void wxSizer::Add( wxWindow *window, int option, int flag, int border )

 {
 {

-    m_children.Append( new wxNewSizerItem( window, option, flag, border ) );
+    m_children.Append( new wxSizerItem( window, option, flag, border ) );

 }
 
 }
 

-void wxNewSizer::Add( wxNewSizer *sizer, int option, int flag, int border )
+void wxSizer::Add( wxSizer *sizer, int option, int flag, int border )

 {
 {

-    m_children.Append( new wxNewSizerItem( sizer, option, flag, border ) );
+    m_children.Append( new wxSizerItem( sizer, option, flag, border ) );

 }
 
 }
 

-void wxNewSizer::Add( int width, int height, int option, int flag, int border )
+void wxSizer::Add( int width, int height, int option, int flag, int border )

 {
 {

-    m_children.Append( new wxNewSizerItem( width, height, option, flag, border ) );
+    m_children.Append( new wxSizerItem( width, height, option, flag, border ) );

 }
 
 }
 

-void wxNewSizer::Fit( wxWindow *window )
+void wxSizer::Prepend( wxWindow *window, int option, int flag, int border )
+{
+    m_children.Insert( new wxSizerItem( window, option, flag, border ) );
+}
+
+void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border )
+{
+    m_children.Insert( new wxSizerItem( sizer, option, flag, border ) );
+}
+
+void wxSizer::Prepend( int width, int height, int option, int flag, int border )
+{
+    m_children.Insert( new wxSizerItem( width, height, option, flag, border ) );
+}
+
+bool wxSizer::Remove( wxWindow *window )
+{
+    wxASSERT( window );
+    
+    wxNode *node = m_children.First();
+    while (node)
+    {
+        wxSizerItem *item = (wxSizerItem*)node->Data();
+       if (item->GetWindow() == window)
+       {
+            m_children.DeleteNode( node );
+           return TRUE;
+       }
+        node = node->Next();
+    }
+    
+    return FALSE;
+}
+
+bool wxSizer::Remove( wxSizer *sizer )
+{
+    wxASSERT( sizer );
+    
+    wxNode *node = m_children.First();
+    while (node)
+    {
+        wxSizerItem *item = (wxSizerItem*)node->Data();
+       if (item->GetSizer() == sizer)
+       {
+            m_children.DeleteNode( node );
+           return TRUE;
+       }
+        node = node->Next();
+    }
+    
+    return FALSE;
+}
+
+bool wxSizer::Remove( int pos )
+{
+    wxNode *node = m_children.Nth( pos );
+    if (!node) return FALSE;
+    
+    m_children.DeleteNode( node );
+    
+    return TRUE;
+}
+  
+void wxSizer::Fit( wxWindow *window )

 {
     window->SetSize( GetMinWindowSize( window ) );
 }
 
 {
     window->SetSize( GetMinWindowSize( window ) );
 }
 

-void wxNewSizer::Layout()
+void wxSizer::Layout()

 {
 {

-    m_size = CalcMin();
+    CalcMin();

     RecalcSizes();
 }
 
     RecalcSizes();
 }
 

-void wxNewSizer::SetSizeHints( wxWindow *window )
+void wxSizer::SetSizeHints( wxWindow *window )

 {
     wxSize size( GetMinWindowSize( window ) );
     window->SetSizeHints( size.x, size.y );
 }
 
 {
     wxSize size( GetMinWindowSize( window ) );
     window->SetSizeHints( size.x, size.y );
 }
 

-wxSize wxNewSizer::GetMinWindowSize( wxWindow *window )
+wxSize wxSizer::GetMinWindowSize( wxWindow *window )

 {
     wxSize minSize( GetMinSize() );
     wxSize size( window->GetSize() );
 {
     wxSize minSize( GetMinSize() );
     wxSize size( window->GetSize() );


@@ -222,31 +286,29 @@ wxSize wxNewSizer::GetMinWindowSize( wxWindow *window )
                    minSize.y+size.y-client_size.y ); 
 }
 
                    minSize.y+size.y-client_size.y ); 
 }
 

-void wxNewSizer::SetDimension( int x, int y, int width, int height )
+void wxSizer::SetDimension( int x, int y, int width, int height )

 {
     m_position.x = x;
     m_position.y = y;
     m_size.x = width;
     m_size.y = height;
 {
     m_position.x = x;
     m_position.y = y;
     m_size.x = width;
     m_size.y = height;

+    CalcMin();

     RecalcSizes();
 }
 
 //---------------------------------------------------------------------------
     RecalcSizes();
 }
 
 //---------------------------------------------------------------------------

-// wxBox
+// wxBoxSizer

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

-wxBox::wxBox( int orient )
+wxBoxSizer::wxBoxSizer( int orient )

 {
     m_orient = orient;
 }
 
 {
     m_orient = orient;
 }
 

-void wxBox::RecalcSizes()
+void wxBoxSizer::RecalcSizes()

 {
     if (m_children.GetCount() == 0)
 {
     if (m_children.GetCount() == 0)

-    {
-        SetDimension( m_position.x, m_position.y, 2, 2 );

         return;
         return;

-    }

     
     int delta = 0;
     int extra = 0;
     
     int delta = 0;
     int extra = 0;


@@ -269,7 +331,7 @@ void wxBox::RecalcSizes()
     wxNode *node = m_children.GetFirst();
     while (node)
     {
     wxNode *node = m_children.GetFirst();
     while (node)
     {

-        wxNewSizerItem *item = (wxNewSizerItem*) node->Data();
+        wxSizerItem *item = (wxSizerItem*) node->Data();

 
        int weight = 1;
        if (item->GetOption())
 
        int weight = 1;
        if (item->GetOption())


@@ -328,7 +390,7 @@ void wxBox::RecalcSizes()
     }
 }
 
     }
 }
 

-wxSize wxBox::CalcMin()
+wxSize wxBoxSizer::CalcMin()

 {
     if (m_children.GetCount() == 0)
         return wxSize(2,2);
 {
     if (m_children.GetCount() == 0)
         return wxSize(2,2);


@@ -342,7 +404,7 @@ wxSize wxBox::CalcMin()
     wxNode *node = m_children.GetFirst();
     while (node)
     {
     wxNode *node = m_children.GetFirst();
     while (node)
     {

-        wxNewSizerItem *item = (wxNewSizerItem*) node->Data();
+        wxSizerItem *item = (wxSizerItem*) node->Data();

        
        int weight = 1;
        if (item->GetOption())
        
        int weight = 1;
        if (item->GetOption())


@@ -384,3 +446,55 @@ wxSize wxBox::CalcMin()
        
     return wxSize( m_minWidth, m_minHeight );
 }
        
     return wxSize( m_minWidth, m_minHeight );
 }

+
+//---------------------------------------------------------------------------
+// wxStaticBoxSizer
+//---------------------------------------------------------------------------
+
+wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
+  : wxBoxSizer( orient )
+{
+    wxASSERT_MSG( box, _T("wxStaticBoxSizer needs a static box") );
+    
+    m_staticBox = box;
+}
+   
+void wxStaticBoxSizer::RecalcSizes()
+{
+    // this will have to be done platform by platform
+    // as there is no way to guess the thickness of
+    // a wxStaticBox border
+    int top_border = 15;
+    if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
+    int other_border = 5;
+
+    m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
+    
+    wxPoint old_pos( m_position );
+    m_position.x += other_border;
+    m_position.y += top_border;
+    wxSize old_size( m_size );
+    m_size.x -= 2*other_border;
+    m_size.y -= top_border + other_border;
+    
+    wxBoxSizer::RecalcSizes();
+    
+    m_position = old_pos;
+    m_size = old_size;
+}
+
+wxSize wxStaticBoxSizer::CalcMin()
+{
+    // this will have to be done platform by platform
+    // as there is no way to guess the thickness of
+    // a wxStaticBox border
+    int top_border = 15;
+    if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
+    int other_border = 5;
+    
+    wxSize ret( wxBoxSizer::CalcMin() );
+    ret.x += 2*top_border;
+    ret.y += other_border + top_border;
+    
+    return ret;
+}