use full 32bit range for the process ids

[wxWidgets.git] / contrib / src / fl / dyntbar.cpp

diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
index fe381fa5908976fb68e327f725f61dc0184e9444..fe526de12e05b3031c079d76f110769e97e3e935 100644 (file)
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        No names yet.
-// Purpose:     Contrib. demo
+// Name:        dyntbar.cpp
+// Purpose:     wxDynamicToolBar implementation

 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     ??/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     ??/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas

-// Licence:    wxWindows license
+// Licence:       wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -16,7 +16,6 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 

-

 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif


@@ -30,291 +29,303 @@
 #include "wx/fl/dyntbar.h"
 #include "wx/fl/newbmpbtn.h"
 
 #include "wx/fl/dyntbar.h"
 #include "wx/fl/newbmpbtn.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxDynamicToolBar, wxControl )
+IMPLEMENT_DYNAMIC_CLASS( wxDynamicToolBar, wxToolBarBase )

 
 

-BEGIN_EVENT_TABLE( wxDynamicToolBar, wxControl )
+BEGIN_EVENT_TABLE( wxDynamicToolBar, wxToolBarBase )

 
 

-       EVT_SIZE ( wxDynamicToolBar::OnSize  )
-       EVT_PAINT( wxDynamicToolBar::OnPaint )
-       //EVT_ERASE_BACKGROUND( wxDynamicToolBar::OnEraseBackground )
+    EVT_SIZE ( wxDynamicToolBar::OnSize  )
+    EVT_PAINT( wxDynamicToolBar::OnPaint )
+    //EVT_ERASE_BACKGROUND( wxDynamicToolBar::OnEraseBackground )

 
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 

+/***** Implementation for class wxToolLayoutItem *****/
+        
+IMPLEMENT_DYNAMIC_CLASS(wxToolLayoutItem, wxObject)
+
+

 /***** Implementation for class wxDynToolInfo *****/
 /***** Implementation for class wxDynToolInfo *****/

-               
+        

 IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)
 
 /***** Implementation for class wxDynamicToolBar *****/
 
 wxDynamicToolBar::wxDynamicToolBar()
 IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)
 
 /***** Implementation for class wxDynamicToolBar *****/
 
 wxDynamicToolBar::wxDynamicToolBar()

-       : mpLayoutMan( NULL ),
-         mSepartorSize( 8 ),
-         mVertGap ( 0 ),
-         mHorizGap( 0 )
+    : mpLayoutMan( NULL ),
+      mSepartorSize( 8 ),
+      mVertGap ( 0 ),
+      mHorizGap( 0 )

 {
 }
 
 wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id, 
 {
 }
 
 wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id, 

-                                                                  const wxPoint& pos, const wxSize& size,
-                                                                  const long style, const int orientation,
-                                                                  const int RowsOrColumns, const wxString& name )
-       : mpLayoutMan( NULL ),
-         mSepartorSize( 8 ),
-         mVertGap ( 0 ),
-         mHorizGap( 0 )
+                                   const wxPoint& pos, const wxSize& size,
+                                   const long style, const int orientation,
+                                   const int RowsOrColumns, const wxString& name )
+    : mpLayoutMan( NULL ),
+      mSepartorSize( 8 ),
+      mVertGap ( 0 ),
+      mHorizGap( 0 )

 {
 {

-       Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);
+    Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);

 
 

-       SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE) );
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE) );

 }
 
 bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id, 
 }
 
 bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id, 

-                                                     const wxPoint& pos, 
-                                                         const wxSize& size,
-                                                         const long style, 
-                                                         const int orientation, const int RowsOrColumns, 
-                                                         const wxString& name)
+                              const wxPoint& pos, 
+                              const wxSize& size,
+                              const long style, 
+                              const int orientation, const int RowsOrColumns, 
+                              const wxString& name)

 {
 {

-       // cut&pasted from wxtbatsmpl.h
+    // cut&pasted from wxtbatsmpl.h

 
 

-       if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
-               return FALSE;
+    if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
+        return FALSE;

 
 

-       SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ));
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));

 
 

-       return TRUE;
+    return TRUE;

 }
 
 bool wxDynamicToolBar::Realize(void)
 {
 }
 
 bool wxDynamicToolBar::Realize(void)
 {

-       // FOR NOW:: nothing
-       return TRUE;
+    // FOR NOW:: nothing
+    return TRUE;

 }
 
 wxDynamicToolBar::~wxDynamicToolBar(void)
 {
 }
 
 wxDynamicToolBar::~wxDynamicToolBar(void)
 {

-       if ( mpLayoutMan )
+    if ( mpLayoutMan )

         delete mpLayoutMan;
 
     size_t i;
         delete mpLayoutMan;
 
     size_t i;

-       for( i = 0; i != mTools.Count(); ++i )
+    for( i = 0; i != mTools.Count(); ++i )

     {
     {

-               delete mTools[i];
+        delete mTools[i];

     }
 }
 
 void wxDynamicToolBar::AddTool( int toolIndex, 
     }
 }
 
 void wxDynamicToolBar::AddTool( int toolIndex, 

-                                                               wxWindow* pToolWindow, 
-                                                               const wxSize& size
-                                                     )
+                                wxWindow* pToolWindow, 
+                                const wxSize& size
+                              )

 {
 {

-       wxDynToolInfo* pInfo = new wxDynToolInfo();
+    wxDynToolInfo* pInfo = new wxDynToolInfo();

 
 

-       pInfo->mpToolWnd    = pToolWindow;
-       pInfo->mIndex       = toolIndex;
-       pInfo->mIsSeparator     = FALSE;
+    pInfo->mpToolWnd    = pToolWindow;
+    pInfo->mIndex       = toolIndex;
+    pInfo->mIsSeparator    = FALSE;

 
 

-       int x,y;
-       pToolWindow->GetSize( &x, &y );
-       pInfo->mRealSize.x = x;
-       pInfo->mRealSize.y = y;
-       pInfo->mRect.width = x;
-       pInfo->mRect.height = y;
+    int x,y;
+    pToolWindow->GetSize( &x, &y );
+    pInfo->mRealSize.x = x;
+    pInfo->mRealSize.y = y;
+    pInfo->mRect.width = x;
+    pInfo->mRect.height = y;

 
 

-       mTools.Add( pInfo );
+    mTools.Add( pInfo );

 }
 
 void wxDynamicToolBar::AddTool( int toolIndex, 
 }
 
 void wxDynamicToolBar::AddTool( int toolIndex, 

-                                                               const wxString& imageFileName,
-                                                               int imageFileType, 
-                                                               const wxString& labelText, bool alignTextRight,
-                                                               bool isFlat )
+                                const wxString& imageFileName,
+                                wxBitmapType imageFileType, 
+                                const wxString& labelText, bool alignTextRight,
+                                bool isFlat )

 {
 {

-       wxNewBitmapButton* pBtn =
+    wxNewBitmapButton* pBtn =

 
 

-         new wxNewBitmapButton( imageFileName, imageFileType,
-                                                        labelText, 
-                                                        ( alignTextRight ) 
-                                                        ? NB_ALIGN_TEXT_RIGHT 
-                                                        : NB_ALIGN_TEXT_BOTTOM,
-                                                        isFlat
-                                                  );
+      new wxNewBitmapButton( imageFileName, imageFileType,
+                             labelText, 
+                             ( alignTextRight ) 
+                             ? NB_ALIGN_TEXT_RIGHT 
+                             : NB_ALIGN_TEXT_BOTTOM,
+                             isFlat
+                           );

 
 

-       pBtn->Create( this, toolIndex );
+    pBtn->Create( this, toolIndex );

 
 

-       pBtn->Reshape();
-       
-       AddTool( toolIndex, pBtn );
+    pBtn->Reshape();
+    
+    AddTool( toolIndex, pBtn );

 }
 void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,
 }
 void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,

-                                                               const wxString& labelText, bool alignTextRight,
-                                                               bool isFlat )
+                                const wxString& labelText, bool alignTextRight,
+                                bool isFlat )

 {
 {

-       wxNewBitmapButton* pBtn =
+    wxNewBitmapButton* pBtn =

 
 

-         new wxNewBitmapButton( labelBmp,
-                                                        labelText, 
-                                                        ( alignTextRight ) 
-                                                        ? NB_ALIGN_TEXT_RIGHT 
-                                                        : NB_ALIGN_TEXT_BOTTOM,
-                                                        isFlat
-                                                  );
+      new wxNewBitmapButton( labelBmp,
+                             labelText, 
+                             ( alignTextRight ) 
+                             ? NB_ALIGN_TEXT_RIGHT 
+                             : NB_ALIGN_TEXT_BOTTOM,
+                             isFlat
+                           );

 
 

-       pBtn->Create( this, toolIndex );
+    pBtn->Create( this, toolIndex );

 
 

-       pBtn->Reshape();
-       
-       AddTool( toolIndex, pBtn );
+    pBtn->Reshape();
+    
+    AddTool( toolIndex, pBtn );

 }
 
 
 }
 
 

-  wxToolBarToolBase* 
-         wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap, 
-                                                               const wxBitmap& pushedBitmap,
-                                                               const bool toggle, const long xPos, 
-                                                               const long yPos, wxObject *clientData,
-                                                               const wxString& helpString1, const wxString& helpString2)
+wxToolBarToolBase* 
+      wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap, 
+                                const wxBitmap& pushedBitmap,
+                                const bool toggle, const long xPos, 
+                                const long yPos, wxObject *clientData,
+                                const wxString& helpString1, const wxString& helpString2)

 {
 {

-       wxNewBitmapButton* pBmpBtn = new wxNewBitmapButton( bitmap );
+    wxNewBitmapButton* pBmpBtn = new wxNewBitmapButton( bitmap );
+
+    pBmpBtn->Create( this, toolIndex );

 
 

-       pBmpBtn->Create( this, toolIndex );
+    pBmpBtn->Reshape();

 
 

-       pBmpBtn->Reshape();
+#if wxUSE_TOOLTIPS
+    pBmpBtn->SetToolTip( helpString1 );
+#endif  // wxUSE_TOOLTIPS

 
 

-       AddTool( toolIndex, pBmpBtn );
+    AddTool( toolIndex, pBmpBtn );

 
 

-       return NULL;
+    return NULL;

 }
 
 
 wxDynToolInfo* wxDynamicToolBar::GetToolInfo( int toolIndex )
 {
     size_t i;
 }
 
 
 wxDynToolInfo* wxDynamicToolBar::GetToolInfo( int toolIndex )
 {
     size_t i;

-       for( i = 0; i != mTools.Count(); ++i )
+    for( i = 0; i != mTools.Count(); ++i )

     {
     {

-               if ( mTools[i]->mIndex == toolIndex )
+        if ( mTools[i]->mIndex == toolIndex )

             return mTools[i];
     }
 
             return mTools[i];
     }
 

-       return NULL;
+    return NULL;

 }
 
 void wxDynamicToolBar::RemveTool( int toolIndex )
 {
     size_t i;
 }
 
 void wxDynamicToolBar::RemveTool( int toolIndex )
 {
     size_t i;

-       for( i = 0; i != mTools.Count(); ++i )
+    for( i = 0; i != mTools.Count(); ++i )

     {
     {

-               if ( mTools[i]->mIndex == toolIndex ) 
-               {
-                   if ( mTools[i]->mpToolWnd )
-                   {
-                           mTools[i]->mpToolWnd->Destroy();
-                   }
+        if ( mTools[i]->mIndex == toolIndex ) 
+        {
+            if ( mTools[i]->mpToolWnd )
+            {
+                mTools[i]->mpToolWnd->Destroy();
+            }

             delete mTools[i]; // HVL To be tested!!!
 #if wxCHECK_VERSION(2,3,2)
             delete mTools[i]; // HVL To be tested!!!
 #if wxCHECK_VERSION(2,3,2)

-                       mTools.RemoveAt(i);
+            mTools.RemoveAt(i);

 #else
 #else

-                       mTools.Remove(i);
+            mTools.Remove(i);

 #endif
 #endif

-                       Layout();
+            Layout();

 
 

-                       return;
-               }
+            return;
+        }

     }
     }

-       // TODO:: if not found, should it be an assertion?
+    // TODO:: if not found, should it be an assertion?

 }
 
 void wxDynamicToolBar::AddSeparator( wxWindow* pSepartorWnd )
 {
 }
 
 void wxDynamicToolBar::AddSeparator( wxWindow* pSepartorWnd )
 {

-       wxDynToolInfo* pInfo = new wxDynToolInfo();
-
-       pInfo->mpToolWnd    = pSepartorWnd;
-       pInfo->mIndex       = -1;
-       pInfo->mIsSeparator     = TRUE;
-
-       if ( pSepartorWnd )
-       {
-               pSepartorWnd->Create( this, -1 );
-
-               int x,y;
-               pSepartorWnd->GetSize( &x, &y );
-               pInfo->mRealSize.x = x;
-               pInfo->mRealSize.y = y;
-
-               pInfo->mRect.width = x;
-               pInfo->mRect.height = y;
-       }
-       else
-       {
-               pInfo->mRealSize.x = mSepartorSize;
-               pInfo->mRealSize.y = 0;
-
-               pInfo->mRect.width  = mSepartorSize;
-               pInfo->mRect.height = 0;
-       }
-
-       mTools.Add( pInfo );
+    wxDynToolInfo* pInfo = new wxDynToolInfo();
+
+    pInfo->mpToolWnd    = pSepartorWnd;
+    pInfo->mIndex       = -1;
+    pInfo->mIsSeparator = TRUE;
+
+    // Do we draw a separator or is a other object?
+    if ( pSepartorWnd )
+    {
+        // hvl => Is there a way to know if it was already created?
+        // hvl => shouldn't the pSepartorWnd be created? (like one should expect?)
+        // pSepartorWnd->Create( this, -1 );
+
+        int x,y;
+        pSepartorWnd->GetSize( &x, &y );
+        pInfo->mRealSize.x = x;
+        pInfo->mRealSize.y = y;
+
+        pInfo->mRect.width = x;
+        pInfo->mRect.height = y;
+    }
+    else
+    {
+        // Init x and y to the default.
+        pInfo->mRealSize.x = 0;
+        pInfo->mRealSize.y = 0;
+
+        // Init height and width to the normal size of a separator.
+        pInfo->mRect.width  = mSepartorSize;
+        pInfo->mRect.height = mSepartorSize;
+    }
+
+    mTools.Add( pInfo );

 }
 
 void wxDynamicToolBar::OnEraseBackground( wxEraseEvent& event )
 {
 }
 
 void wxDynamicToolBar::OnEraseBackground( wxEraseEvent& event )
 {

-       // FOR NOW:: nothing
+    // FOR NOW:: nothing

 }
 
 void wxDynamicToolBar::OnSize( wxSizeEvent& event )
 {
 }
 
 void wxDynamicToolBar::OnSize( wxSizeEvent& event )
 {

-       //SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ) );
+    //SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) );

 
 

-       Layout();
+    Layout();

 }
 
 void wxDynamicToolBar::DrawSeparator( wxDynToolInfo& info, wxDC& dc )
 {
 }
 
 void wxDynamicToolBar::DrawSeparator( wxDynToolInfo& info, wxDC& dc )
 {

-       // check the orientation of separator
-       if ( info.mRect.width < info.mRect.height )
-       {
-               int midX = info.mRect.x + info.mRect.width/2 - 1;
-
-               dc.SetPen( *wxGREY_PEN );
-               dc.DrawLine( midX, info.mRect.y,
-                                midX, info.mRect.y + info.mRect.height+1 );
-
-               dc.SetPen( *wxWHITE_PEN );
-               dc.DrawLine( midX+1, info.mRect.y,
-                                midX+1, info.mRect.y + info.mRect.height+1 );
-       }
-       else
-       {
-               int midY = info.mRect.y + info.mRect.height/2 - 1;
-
-               dc.SetPen( *wxGREY_PEN );
-               dc.DrawLine( info.mRect.x, midY,
-                                info.mRect.x + info.mRect.width+1, midY );
-
-               dc.SetPen( *wxWHITE_PEN );
-               dc.DrawLine( info.mRect.x, midY + 1,
-                                info.mRect.x + info.mRect.width+1, midY + 1 );
-       }
+    // check the orientation of separator
+    if ( info.mRect.width < info.mRect.height )
+    {
+        int midX = info.mRect.x + info.mRect.width/2 - 1;
+
+        dc.SetPen( *wxGREY_PEN );
+        dc.DrawLine( midX, info.mRect.y,
+                     midX, info.mRect.y + info.mRect.height+1 );
+
+        dc.SetPen( *wxWHITE_PEN );
+        dc.DrawLine( midX+1, info.mRect.y,
+                     midX+1, info.mRect.y + info.mRect.height+1 );
+    }
+    else
+    {
+        int midY = info.mRect.y + info.mRect.height/2 - 1;
+
+        dc.SetPen( *wxGREY_PEN );
+        dc.DrawLine( info.mRect.x, midY,
+                     info.mRect.x + info.mRect.width+1, midY );
+
+        dc.SetPen( *wxWHITE_PEN );
+        dc.DrawLine( info.mRect.x, midY + 1,
+                     info.mRect.x + info.mRect.width+1, midY + 1 );
+    }

 }
 
 void wxDynamicToolBar::OnPaint( wxPaintEvent& event )
 {
 }
 
 void wxDynamicToolBar::OnPaint( wxPaintEvent& event )
 {

-       // draw separators if any
-
-       wxPaintDC dc(this);
+    // draw separators if any
+    wxPaintDC dc(this);

 
     size_t i;
 
     size_t i;

-       for( i = 0; i != mTools.Count(); ++i )
-       
-               if ( mTools[i]->mIsSeparator ) 
-               {
-                       // check if separator doesn't have it's own window
-                       // if so, then draw it using built-in drawing method
-
-                       if ( !mTools[i]->mpToolWnd )
-
-                               DrawSeparator( *mTools[i], dc );
-               }
+    for( i = 0; i != mTools.Count(); ++i )
+    {
+        if ( mTools[i]->mIsSeparator ) 
+        {
+            // check if separator doesn't have it's own window
+            // if so, then draw it using built-in drawing method
+            if ( !mTools[i]->mpToolWnd )
+                DrawSeparator( *mTools[i], dc );
+        }
+    }

 }
 
 // FOR NOW:: quick fix
 }
 
 // FOR NOW:: quick fix


@@ -322,175 +333,255 @@ void wxDynamicToolBar::OnPaint( wxPaintEvent& event )
 
 void wxDynamicToolBar::SizeToolWindows()
 {
 
 void wxDynamicToolBar::SizeToolWindows()
 {

+    bool bStateCheckDone = FALSE;
+    bool bHorzSeparator  = FALSE;
+    int maxWidth         = 0;
+    int maxHeight        = 0;
+

     size_t i;
     size_t i;

-       for( i = 0; i != mTools.Count(); ++i )
-       {
-               wxDynToolInfo& info = *mTools[i];
-
-               if ( !info.mIsSeparator ) 
-               {
-
-                       // center real rectangle within the rectangle 
-                       // provided by the layout manager
-
-                       int x = info.mRect.x;
-                       int y = info.mRect.y + (info.mRect.height - info.mRealSize.y)/2;
-
-                       // FOR NOW FOR NOW:: quick & dirty fix
-                       if ( info.mpToolWnd->IsKindOf( CLASSINFO( wxChoice ) ) )
-                       {
-                               info.mpToolWnd->SetSize( x,y, 
-                                                                               info.mRealSize.x - 3, 
-                                                                               info.mRealSize.y);
-                       }
-                       else
-                               info.mpToolWnd->SetSize( x,y, 
-                                                                               info.mRealSize.x, 
-                                                                               info.mRealSize.y );
-               }
-
-               // TBD:: size separator window if present
-       }
-}
+    for( i = 0; i != mTools.Count(); ++i )
+    {
+        wxDynToolInfo& info = *mTools[i];

 
 

-bool wxDynamicToolBar::Layout()
-{
-       if ( !mpLayoutMan )
-        mpLayoutMan = CreateDefaulLayout();
+        if ( !info.mIsSeparator ) 
+        {
+            // center real rectangle within the rectangle 
+            // provided by the layout manager

 
 

-       int x,y;
-       GetSize( &x, &y );
-       wxSize wndDim(x,y);
-       wxSize result;
+            int x = info.mRect.x;
+            int y = info.mRect.y + (info.mRect.height - info.mRealSize.y)/2;

 
 

-       wxLayoutItemArrayT items;
+            // FOR NOW FOR NOW:: quick & dirty fix
+            if ( info.mpToolWnd->IsKindOf( CLASSINFO( wxChoice ) ) )
+            {
+                info.mpToolWnd->SetSize( x, y, 
+                                         info.mRealSize.x - 3, 
+                                         info.mRealSize.y);
+            }
+            else
+            {
+                info.mpToolWnd->SetSize( x, y, 
+                                         info.mRealSize.x, 
+                                         info.mRealSize.y );
+            }
+        }
+        else
+        {
+            // We performer this code here, so we only execute it when we have 
+            // separators and we do it only once (all to do with performance...)
+            if (!bStateCheckDone)
+            {
+                bStateCheckDone = TRUE;
+                
+                size_t j;
+                wxDynToolInfo *pInfo = NULL;
+                wxDynToolInfo *pPrevInfo = NULL;
+                int nVertSeparators = 0;
+
+                for( j = 0; j != mTools.Count(); ++j )
+                {
+                    pInfo = mTools[j];
+                    
+                    // Count all Vert Separators.
+                    if ( pInfo->mIsSeparator ) 
+                        nVertSeparators++;
+
+                    // Check if the new row starts with a Separator.
+                    if ( pPrevInfo && pInfo->mIsSeparator &&
+                         // pPrevInfo->mRect.x >= pInfo->mRect.x &&
+                         pPrevInfo->mRect.y < pInfo->mRect.y)
+                    {
+                        // If the Separator is shown on the next row and it's 
+                        // the only object on the row it would mean that the 
+                        // Separator should be shown as Horizontal one.
+                        if (j+1 != mTools.Count())
+                        {
+                            if (pInfo->mRect.y < mTools[j+1]->mRect.y)
+                                nVertSeparators--;
+                        }
+                        else
+                        {
+                            nVertSeparators--;
+                        }
+                    }
+
+                    pPrevInfo = pInfo;
+
+                    maxWidth = wxMax(pInfo->mRect.width, maxWidth);
+                    maxHeight = wxMax(pInfo->mRect.height, maxHeight);
+                }
+                
+                bHorzSeparator = nVertSeparators == 0;
+            }
+            
+            // Check if we should draw Horz or Vert...
+            if ( !bHorzSeparator )
+            {
+                info.mRect.width = mSepartorSize;
+                info.mRect.height = maxHeight;
+            }
+            else
+            {
+                info.mRect.width = maxWidth;
+                info.mRect.height = mSepartorSize;
+            }

 
 

-       // safe conversion
+            // Do we need to set a new size to a seperator object?
+            if ( info.mpToolWnd )
+            {
+                info.mpToolWnd->SetSize( info.mRect.x,
+                                         info.mRect.y, 
+                                         info.mRect.width, 
+                                         info.mRect.height);
+            }
+
+        }
+    }
+}
+
+bool wxDynamicToolBar::Layout()
+{
+    int x,y;
+    GetSize( &x, &y );
+    wxSize wndDim(x,y);
+    wxSize result;

     size_t i;
     size_t i;

-       for( i = 0; i != mTools.Count(); ++i )
-        items.Add( mTools[i] );
+    wxDynToolInfo *pInfo;

 
 

-       mpLayoutMan->Layout( wndDim, result, items, mVertGap, mHorizGap );;
+    // Reset the size of separators...
+    for( i = 0; i != mTools.Count(); ++i )
+    {
+        pInfo = mTools[i];
+        
+        if ( pInfo->mIsSeparator ) 
+        {
+            pInfo->mRect.width  = mSepartorSize;
+            pInfo->mRect.height = mSepartorSize;
+        }
+    }

 
 

-       SizeToolWindows();
+    // Calc and set the best layout
+    GetPreferredDim( wndDim, result );
+
+    SizeToolWindows();

     return TRUE;
 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
 {
     return TRUE;
 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
 {

-       if ( !mpLayoutMan )
-        mpLayoutMan = CreateDefaulLayout();
+    if ( !mpLayoutMan )
+        mpLayoutMan = CreateDefaultLayout();

 
 

-       wxLayoutItemArrayT items;
+    wxLayoutItemArrayT items;

 
 

-       // safe conversion
+    // safe conversion

     size_t i;
     size_t i;

-       for( i = 0; i != mTools.Count(); ++i )
+    for( i = 0; i != mTools.Count(); ++i )

         items.Add( mTools[i] );
 
         items.Add( mTools[i] );
 

-       mpLayoutMan->Layout( givenDim, prefDim, items, mVertGap, mHorizGap );;
+    mpLayoutMan->Layout( givenDim, prefDim, items, mVertGap, mHorizGap );

 }
 
 void wxDynamicToolBar::SetLayout( LayoutManagerBase* pLayout )
 {
 }
 
 void wxDynamicToolBar::SetLayout( LayoutManagerBase* pLayout )
 {

-       if ( mpLayoutMan )
+    if ( mpLayoutMan )

         delete mpLayoutMan;
 
         delete mpLayoutMan;
 

-       mpLayoutMan = pLayout;
+    mpLayoutMan = pLayout;

 
 

-       Layout();
+    Layout();

 }
 
 void wxDynamicToolBar::EnableTool(const int toolIndex, const bool enable )
 {
 }
 
 void wxDynamicToolBar::EnableTool(const int toolIndex, const bool enable )
 {

-       wxDynToolInfo* pInfo = GetToolInfo( toolIndex );
+    wxDynToolInfo* pInfo = GetToolInfo( toolIndex );

 
 

-       if ( !pInfo )
+    if ( !pInfo )

         return;
 
         return;
 

-       if ( pInfo->mIsSeparator || !pInfo->mpToolWnd )
+    if ( pInfo->mIsSeparator || !pInfo->mpToolWnd )

         return;
 
         return;
 

-       pInfo->mpToolWnd->Enable( enable );
+    pInfo->mpToolWnd->Enable( enable );

 }
 
 /***** Implementation for class BagLayout *****/
 
 void BagLayout::Layout(  const wxSize&       parentDim, 
 }
 
 /***** Implementation for class BagLayout *****/
 
 void BagLayout::Layout(  const wxSize&       parentDim, 

-                                                wxSize&                 resultingDim,
-                                                wxLayoutItemArrayT& items,
-                                                int                     horizGap,
-                                int                     vertGap  
-                                         )
+                         wxSize&             resultingDim,
+                         wxLayoutItemArrayT& items,
+                         int                 horizGap,
+                         int                 vertGap  
+                      )

 {
 {

-       int maxWidth = 0;
-       int curY  = 0;
-       int nRows = 0;
+    int maxWidth = 0;
+    int curY  = 0;
+    int nRows = 0;

 
 

-       size_t i = 0;
+    size_t i = 0;

 
 

-       while( i < items.Count() )
-       {
-               int curX   = 0;
-               int height = 0;
-               // int nItems = 0;
+    while( i < items.Count() )
+    {
+        int curX   = 0;
+        int height = 0;
+        // int nItems = 0;

 
 

-               // int firstItem  = i;
-               int itemsInRow = 0;
+        // int firstItem  = i;
+        int itemsInRow = 0;

 
 

-               if ( nRows > 0 )
+        if ( nRows > 0 )

             curY += vertGap;
 
             curY += vertGap;
 

-               // step #1 - arrange horizontal positions of items in the row
+        // step #1 - arrange horizontal positions of items in the row

 
 

-               do
-               {
-                       if ( itemsInRow > 0 )
+        do
+        {
+            if ( itemsInRow > 0 )

                 curX += horizGap;
 
                 curX += horizGap;
 

-                       wxRect& r = items[i]->mRect;
+            wxRect& r = items[i]->mRect;

 
 

-                       if ( curX + r.width > parentDim.x )
+            if ( curX + r.width > parentDim.x )

             {
             {

-                               if ( itemsInRow > 0 ) 
+                if ( itemsInRow > 0 ) 

                     break;
             }
                     break;
             }

-                       r.x = curX;
-                       r.y = curY;
+            r.x = curX;
+            r.y = curY;

 
 

-                       curX += r.width;
+            curX += r.width;

 
 

-                       height = wxMax( height, r.height );
+            height = wxMax( height, r.height );

 
 

-                       ++itemsInRow;
-                       ++i;
+            ++itemsInRow;
+            ++i;

 
 

-               } while( i < items.Count() );
+        } while( i < items.Count() );

 
 

-               curY += height;
+        curY += height;

 
 

-               maxWidth = wxMax( maxWidth, curX );
-       }
+        maxWidth = wxMax( maxWidth, curX );
+    }

 
 

-       resultingDim.x = maxWidth;
-       resultingDim.y = curY;
+    resultingDim.x = maxWidth;
+    resultingDim.y = curY;

 }
 
 //////// stuff from 2.1.15 ///////////
 
 wxToolBarToolBase* wxDynamicToolBar::FindToolForPosition( wxCoord x, wxCoord y ) const
 {
 }
 
 //////// stuff from 2.1.15 ///////////
 
 wxToolBarToolBase* wxDynamicToolBar::FindToolForPosition( wxCoord x, wxCoord y ) const
 {

-       return NULL;
+    return NULL;

 }
 
 bool wxDynamicToolBar::DoInsertTool( size_t pos, wxToolBarToolBase* tool )
 {
 }
 
 bool wxDynamicToolBar::DoInsertTool( size_t pos, wxToolBarToolBase* tool )
 {

-       return TRUE;
+    return TRUE;

 }
 
 bool wxDynamicToolBar::DoDeleteTool( size_t pos, wxToolBarToolBase* tool )
 {
 }
 
 bool wxDynamicToolBar::DoDeleteTool( size_t pos, wxToolBarToolBase* tool )
 {

-       return TRUE;
+    return TRUE;

 }
 
 void wxDynamicToolBar::DoEnableTool( wxToolBarToolBase* tool, bool enable )
 }
 
 void wxDynamicToolBar::DoEnableTool( wxToolBarToolBase* tool, bool enable )


@@ -505,13 +596,13 @@ void wxDynamicToolBar::DoSetToggle( wxToolBarToolBase* tool, bool toggle )
 {
 }
 
 {
 }
 

-wxToolBarToolBase* wxDynamicToolBar::CreateTool( int id, const wxBitmap& bitmap1, const wxBitmap& bitmap2, bool toggle, wxObject* clientData, const wxString& shortHelpString, const wxString& longHelpString )
+wxToolBarToolBase* wxDynamicToolBar::CreateTool( int id, const wxString& label, const wxBitmap& bmpNormal, const wxBitmap& bmpDisabled, wxItemKind kind, wxObject *clientData, const wxString& shortHelp, const wxString& longHelp)

 {
 {

-       return NULL;
+    return NULL;

 }
 
 wxToolBarToolBase* wxDynamicToolBar::CreateTool( wxControl* control )
 {
 }
 
 wxToolBarToolBase* wxDynamicToolBar::CreateTool( wxControl* control )
 {

-       return NULL;
+    return NULL;

 }
 
 }