don't set translation credits if they're empty (part of patch 1586730)

[wxWidgets.git] / src / os2 / frame.cpp

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index b885819f933ba54679068522485f7ec95e801f0d..38c03e700b115b9bcbbed7cf15375a5cdb0df82e 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -704,13 +704,20 @@ void wxFrame::PositionToolBar()
                           ,vTHeight
                          );
     }
-    else if (pToolBar->GetWindowStyleFlag() & wxTB_BOTTOM )
+    else if (pToolBar->GetWindowStyleFlag() & wxTB_BOTTOM)
     {
+        wxCoord                     vSwidth = 0;
+        wxCoord                     vSheight = 0;
+
+        if (m_frameStatusBar)
+            m_frameStatusBar->GetSize( &vSwidth
+                                      ,&vSheight
+                                     );
         vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
         pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
-                          ,vRect.yBottom - vTHeight      // assuming the vRect contains the client coordinates
+                          ,vFRect.yTop - vRect.yBottom - vTHeight - vSheight
                           ,vWidth
-                          ,vHeight
+                          ,vTHeight
                          );
     }
     else
@@ -1108,6 +1115,13 @@ MRESULT EXPENTRY wxFrameMainWndProc( HWND   hWnd,
                             pSWP[i].cx   = vRectl.xRight - vRectl.xLeft;
                             pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
                         }
+                        else if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_BOTTOM)
+                        {
+                            pSWP[i].x    = vRectl.xLeft;
+                            pSWP[i].y    = vRectl.yBottom + nHeight + nHeight2;
+                            pSWP[i].cx   = vRectl.xRight - vRectl.xLeft;
+                            pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
+                         }
                         else
                         {
                             pSWP[i].x    = vRectl.xLeft + nWidth;