Corrections to position and size for toolbar.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index ae8f7cf2215844541a742efe64c9d444b716f7b6..9e9729670098a5ee77ff37eac0a33356683baae3 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -96,13 +96,18 @@ void wxFrame::PositionMenuBar()
         // the menubar is positioned above the client size, hence the negative
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
         // the menubar is positioned above the client size, hence the negative
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;

+        
+        wxCoord heightTbar = 0;
+        // In between sits the toolbar
+        if (m_frameToolBar)
+            heightTbar = m_frameToolBar->GetSize().y;

 
         m_frameMenuBar->SetSize(0, 
 #ifdef __WXPM__         // FIXME -- remove this, make wxOS2/Univ behave as
                  //          the rest of the world!!!
                                 GetClientSize().y - heightMbar,
 #else
 
         m_frameMenuBar->SetSize(0, 
 #ifdef __WXPM__         // FIXME -- remove this, make wxOS2/Univ behave as
                  //          the rest of the world!!!
                                 GetClientSize().y - heightMbar,
 #else

-                                -heightMbar,
+                                - heightMbar - heightTbar,

 #endif                         
                                 GetClientSize().x, heightMbar);
     }
 #endif                         
                                 GetClientSize().x, heightMbar);
     }


@@ -191,7 +196,8 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     }
 #endif // wxUSE_MENUS
 
     }
 #endif // wxUSE_MENUS
 

-#if wxUSE_TOOLBAR
+   // This is done in wxFrameBase already
+#if 0 // wxUSE_TOOLBAR

     if ( m_frameToolBar )
     {
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
     if ( m_frameToolBar )
     {
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index d6735a1abc84df721c6a3e6296fb5e6b5d1f1723..298810816775d40becd5e107dc1a46ea92c2782f 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -165,6 +165,10 @@ void wxToolBar::OnPaint(wxPaintEvent &event)
 {
     wxPaintDC dc(this);
     
 {
     wxPaintDC dc(this);
     

+    wxSize clientSize = GetClientSize();
+    dc.SetPen( *wxBLACK_PEN );
+    dc.DrawLine( 0,0, clientSize.x,0 );
+    

     for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
           node;
           node = node->GetNext() )
     for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
           node;
           node = node->GetNext() )


@@ -201,6 +205,8 @@ bool wxToolBar::Realize()
         x += m_defaultWidth + 6;
     }
     
         x += m_defaultWidth + 6;
     }
     

+    SetSize( x+16, m_defaultHeight + 14 );
+    

     return TRUE;
 }
 
     return TRUE;
 }