Add class factories for filter streams. Also filters now follow the convention

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index e7b33f782911d20c4aac7b6c049553264e365501..38c03e700b115b9bcbbed7cf15375a5cdb0df82e 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -13,7 +13,6 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/object.h"
     #include "wx/dynarray.h"
     #include "wx/list.h"
     #include "wx/object.h"
     #include "wx/dynarray.h"
     #include "wx/list.h"


@@ -30,28 +29,17 @@
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/mdi.h"

+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+    #include "wx/menuitem.h"

 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 

-#if wxUSE_STATUSBAR
-    #include "wx/statusbr.h"
-    #include "wx/generic/statusbr.h"
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
-#include "wx/menuitem.h"
-#include "wx/log.h"
-

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 

-extern wxList WXDLLEXPORT wxPendingDelete;
-

 #if wxUSE_MENUS_NATIVE
 extern wxMenu *wxCurrentPopupMenu;
 #endif
 #if wxUSE_MENUS_NATIVE
 extern wxMenu *wxCurrentPopupMenu;
 #endif


@@ -716,6 +704,22 @@ void wxFrame::PositionToolBar()
                           ,vTHeight
                          );
     }
                           ,vTHeight
                          );
     }

+    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
+                          ,vFRect.yTop - vRect.yBottom - vTHeight - vSheight
+                          ,vWidth
+                          ,vTHeight
+                         );
+    }

     else
     {
         wxCoord                     vSwidth = 0;
     else
     {
         wxCoord                     vSwidth = 0;


@@ -1111,6 +1115,13 @@ MRESULT EXPENTRY wxFrameMainWndProc( HWND   hWnd,
                             pSWP[i].cx   = vRectl.xRight - vRectl.xLeft;
                             pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
                         }
                             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;
                         else
                         {
                             pSWP[i].x    = vRectl.xLeft + nWidth;