Fixed wxMessageBox with only an OK button returning wxCANCEL under MSW.

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index df4efda67e3528c8b4cfdce9db98ba2f3c9f9b69..6f200c9ddeb134ba9377bc15ff4f0a750bd2c73f 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.cpp
+// Name:        src/os2/frame.cpp

 // Purpose:     wxFrame
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFrame
 // Author:      David Webster
 // Modified by:


@@ -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"


@@ -22,7 +21,6 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/event.h"

-    #include "wx/setup.h"

     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/app.h"


@@ -31,36 +29,21 @@
     #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
 

-extern void  wxAssociateWinWithHandle( HWND         hWnd
-                                      ,wxWindowOS2* pWin
-                                     );
-

 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------


@@ -69,8 +52,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -83,7 +64,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #if wxUSE_NATIVE_STATUSBAR
     bool wxFrame::m_bUseNativeStatusBar = true;
 #else
 #if wxUSE_NATIVE_STATUSBAR
     bool wxFrame::m_bUseNativeStatusBar = true;
 #else

-    bool wxFrame::m_bUseNativeStatusBar = FALSE;
+    bool wxFrame::m_bUseNativeStatusBar = false;

 #endif
 
 #endif //wxUSE_STATUSBAR
 #endif
 
 #endif //wxUSE_STATUSBAR


@@ -98,7 +79,7 @@ void wxFrame::Init()
     m_nFsStatusBarHeight = 0;
     m_nFsToolBarHeight   = 0;
     m_hWndToolTip        = 0L;
     m_nFsStatusBarHeight = 0;
     m_nFsToolBarHeight   = 0;
     m_hWndToolTip        = 0L;

-    m_bWasMinimized      = FALSE;
+    m_bWasMinimized      = false;

 
 
     m_frameMenuBar   = NULL;
 
 
     m_frameMenuBar   = NULL;


@@ -118,7 +99,7 @@ void wxFrame::Init()
     memset(&m_vSwpVScroll, 0, sizeof(SWP));
     memset(&m_vSwpStatusBar, 0, sizeof(SWP));
     memset(&m_vSwpToolBar, 0, sizeof(SWP));
     memset(&m_vSwpVScroll, 0, sizeof(SWP));
     memset(&m_vSwpStatusBar, 0, sizeof(SWP));
     memset(&m_vSwpToolBar, 0, sizeof(SWP));

-    m_bIconized = FALSE;
+    m_bIconized = false;

 
 } // end of wxFrame::Init
 
 
 } // end of wxFrame::Init
 


@@ -144,7 +125,8 @@ bool wxFrame::Create( wxWindow*       pParent,
 
 wxFrame::~wxFrame()
 {
 
 wxFrame::~wxFrame()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();
+

     DeleteAllBars();
 } // end of wxFrame::~wxFrame
 
     DeleteAllBars();
 } // end of wxFrame::~wxFrame
 


@@ -236,19 +218,14 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
 
     int                             nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY());
 
 
     int                             nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY());
 

-    pStatusBar->SetSize( -1
-                        ,-1
-                        ,-1
+    pStatusBar->SetSize( wxDefaultCoord
+                        ,wxDefaultCoord
+                        ,wxDefaultCoord

                         ,nHeight
                        );
 
                         ,nHeight
                        );
 

-    ::WinSetParent( pStatusBar->GetHWND()
-                   ,m_hFrame
-                   ,FALSE
-                  );
-    ::WinSetOwner( pStatusBar->GetHWND()
-                  ,m_hFrame
-                 );
+    ::WinSetParent( pStatusBar->GetHWND(), m_hFrame, FALSE );
+    ::WinSetOwner( pStatusBar->GetHWND(), m_hFrame);

     //
     // to show statusbar
     //
     //
     // to show statusbar
     //


@@ -302,7 +279,7 @@ void wxFrame::PositionStatusBar()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError(_T("Error setting parent for StautsBar. Error: %s\n"), sError.c_str());
+            wxLogError(wxT("Error setting parent for StatusBar. Error: %s\n"), sError.c_str());

             return;
         }
     }
             return;
         }
     }


@@ -310,24 +287,15 @@ void wxFrame::PositionStatusBar()
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR

-wxToolBar* wxFrame::OnCreateToolBar(
-  long                              lStyle
-, wxWindowID                        vId
-, const wxString&                   rsName
-)
+wxToolBar* wxFrame::OnCreateToolBar( long lStyle, wxWindowID vId, const wxString& rsName )

 {
     wxToolBar*                      pToolBar = wxFrameBase::OnCreateToolBar( lStyle
                                                                             ,vId
                                                                             ,rsName
                                                                            );
 
 {
     wxToolBar*                      pToolBar = wxFrameBase::OnCreateToolBar( lStyle
                                                                             ,vId
                                                                             ,rsName
                                                                            );
 

-    ::WinSetParent( pToolBar->GetHWND()
-                   ,m_hFrame
-                   ,FALSE
-                  );
-    ::WinSetOwner( pToolBar->GetHWND()
-                  ,m_hFrame
-                 );
+    ::WinSetParent( pToolBar->GetHWND(), m_hFrame, FALSE);
+    ::WinSetOwner( pToolBar->GetHWND(), m_hFrame);

     return pToolBar;
 } // end of WinGuiBase_CFrame::OnCreateToolBar
 #endif
     return pToolBar;
 } // end of WinGuiBase_CFrame::OnCreateToolBar
 #endif


@@ -435,14 +403,14 @@ void wxFrame::InternalSetMenuBar()
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError(_T("Error setting parent for submenu. Error: %s\n"), sError.c_str());
+        wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str());

     }
 
     if (!::WinSetOwner(m_hMenu, m_hFrame))
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     }
 
     if (!::WinSetOwner(m_hMenu, m_hFrame))
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError(_T("Error setting parent for submenu. Error: %s\n"), sError.c_str());
+        wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str());

     }
     ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
 } // end of wxFrame::InternalSetMenuBar
     }
     ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
 } // end of wxFrame::InternalSetMenuBar


@@ -464,7 +432,7 @@ void wxFrame::OnSysColourChanged(
         wxSysColourChangedEvent     vEvent2;
 
         vEvent2.SetEventObject(m_frameStatusBar);
         wxSysColourChangedEvent     vEvent2;
 
         vEvent2.SetEventObject(m_frameStatusBar);

-        m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
+        m_frameStatusBar->HandleWindowEvent(vEvent2);

     }
 #endif //wxUSE_STATUSBAR
 
     }
 #endif //wxUSE_STATUSBAR
 


@@ -480,7 +448,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle )
     if (bShow)
     {
         if (IsFullScreen())
     if (bShow)
     {
         if (IsFullScreen())

-            return FALSE;
+            return false;

 
         m_bFsIsShowing = true;
         m_lFsStyle = lStyle;
 
         m_bFsIsShowing = true;
         m_lFsStyle = lStyle;


@@ -511,8 +479,8 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle )
         //
         if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar)
         {
         //
         if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar)
         {

-            pTheToolBar->SetSize(-1,0);
-            pTheToolBar->Show(FALSE);
+            pTheToolBar->SetSize(wxDefaultCoord,0);
+            pTheToolBar->Show(false);

         }
 #endif //wxUSE_TOOLBAR
 
         }
 #endif //wxUSE_TOOLBAR
 


@@ -530,7 +498,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle )
         if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar)
         {
             m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount();
         if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar)
         {
             m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount();

-            SetStatusBar((wxStatusBar*) NULL);
+            SetStatusBar(NULL);

             delete pTheStatusBar;
         }
         else
             delete pTheStatusBar;
         }
         else


@@ -580,7 +548,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle )
         ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
         nWidth = vRect.xRight - vRect.xLeft;
         //
         ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
         nWidth = vRect.xRight - vRect.xLeft;
         //

-        // Rmember OS/2 is backwards!
+        // Remember OS/2 is backwards!

         //
         nHeight = vRect.yTop - vRect.yBottom;
 
         //
         nHeight = vRect.yTop - vRect.yBottom;
 


@@ -601,7 +569,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle )
         wxSize sz( nWidth, nHeight );
         wxSizeEvent vEvent( sz, GetId() );
 
         wxSize sz( nWidth, nHeight );
         wxSizeEvent vEvent( sz, GetId() );
 

-        GetEventHandler()->ProcessEvent(vEvent);
+        HandleWindowEvent(vEvent);

         return true;
     }
     else
         return true;
     }
     else


@@ -619,7 +587,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle )
         //
         if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))
         {
         //
         if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))
         {

-            pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
+            pTheToolBar->SetSize(wxDefaultCoord, m_nFsToolBarHeight);

             pTheToolBar->Show(true);
         }
 #endif //wxUSE_TOOLBAR
             pTheToolBar->Show(true);
         }
 #endif //wxUSE_TOOLBAR


@@ -726,7 +694,7 @@ void wxFrame::PositionToolBar()
                       ,&vTHeight
                      );
 
                       ,&vTHeight
                      );
 

-    if (pToolBar->GetWindowStyleFlag() & wxTB_HORIZONTAL)
+    if (pToolBar->GetWindowStyleFlag() & wxTB_TOP)

     {
         vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
         pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
     {
         vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
         pToolBar->SetSize( vRect.xLeft - vFRect.xLeft


@@ -735,6 +703,38 @@ 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 if (pToolBar->GetWindowStyleFlag() & wxTB_LEFT)
+    {
+        wxCoord                     vSwidth = 0;
+        wxCoord                     vSheight = 0;
+
+        if (m_frameStatusBar)
+            m_frameStatusBar->GetSize( &vSwidth
+                                      ,&vSheight
+                                     );
+        vHeight = (wxCoord)(vRect.yTop - vRect.yBottom);
+        pToolBar->SetSize( vRect.xLeft - vRect.xLeft
+                          ,vPos.y
+                          ,vTWidth
+                          ,vHeight - vSheight
+                         );
+    }

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


@@ -745,7 +745,7 @@ void wxFrame::PositionToolBar()
                                       ,&vSheight
                                      );
         vHeight = (wxCoord)(vRect.yTop - vRect.yBottom);
                                       ,&vSheight
                                      );
         vHeight = (wxCoord)(vRect.yTop - vRect.yBottom);

-        pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
+        pToolBar->SetSize( vRect.xRight - vFRect.xLeft - vTWidth

                           ,vPos.y
                           ,vTWidth
                           ,vHeight - vSheight
                           ,vPos.y
                           ,vTWidth
                           ,vHeight - vSheight


@@ -817,23 +817,21 @@ WXHICON wxFrame::GetDefaultIcon() const
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------

-bool wxFrame::OS2TranslateMessage(
-  WXMSG*                            pMsg
-)
+bool wxFrame::OS2TranslateMessage( WXMSG* pMsg )

 {
     //
     // try the menu bar accels
     //
 {
     //
     // try the menu bar accels
     //

-    wxMenuBar*                      pMenuBar = GetMenuBar();
+    wxMenuBar* pMenuBar = GetMenuBar();

 
     if (!pMenuBar)
 
     if (!pMenuBar)

-        return FALSE;
+        return false;

 
 #if wxUSE_ACCEL && wxUSE_MENUS_NATIVE
     const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
     return rAcceleratorTable.Translate(GetHWND(), pMsg);
 #else
 
 #if wxUSE_ACCEL && wxUSE_MENUS_NATIVE
     const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
     return rAcceleratorTable.Translate(GetHWND(), pMsg);
 #else

-    return FALSE;
+    return false;

 #endif //wxUSE_ACCEL
 } // end of wxFrame::OS2TranslateMessage
 
 #endif //wxUSE_ACCEL
 } // end of wxFrame::OS2TranslateMessage
 


@@ -854,7 +852,7 @@ bool wxFrame::HandlePaint()
             const wxIcon&           vIcon = GetIcon();
             HPOINTER                hIcon;
 
             const wxIcon&           vIcon = GetIcon();
             HPOINTER                hIcon;
 

-            if (vIcon.Ok())
+            if (vIcon.IsOk())

                 hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
             else
                 hIcon = (HPOINTER)m_hDefaultIcon;
                 hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
             else
                 hIcon = (HPOINTER)m_hDefaultIcon;


@@ -877,16 +875,12 @@ bool wxFrame::HandlePaint()
 
                 ::WinQueryWindowRect(GetHwnd(), &vRect3);
 
 
                 ::WinQueryWindowRect(GetHwnd(), &vRect3);
 

-#ifndef __WATCOMC__
-// FIXME: incomplete headers ???
-

                 static const int    nIconWidth = 32;
                 static const int    nIconHeight = 32;
                 int                 nIconX = (int)((vRect3.xRight - nIconWidth)/2);
                 int                 nIconY = (int)((vRect3.yBottom + nIconHeight)/2);
 
                 ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL);
                 static const int    nIconWidth = 32;
                 static const int    nIconHeight = 32;
                 int                 nIconX = (int)((vRect3.xRight - nIconWidth)/2);
                 int                 nIconY = (int)((vRect3.yBottom + nIconHeight)/2);
 
                 ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL);

-#endif

             }
             ::WinEndPaint(hPs);
         }
             }
             ::WinEndPaint(hPs);
         }


@@ -931,13 +925,9 @@ bool wxFrame::HandlePaint()
     return true;
 } // end of wxFrame::HandlePaint
 
     return true;
 } // end of wxFrame::HandlePaint
 

-bool wxFrame::HandleSize(
-  int                               nX
-, int                               nY
-, WXUINT                            nId
-)
+bool wxFrame::HandleSize( int nX, int nY, WXUINT nId )

 {
 {

-    bool                            bProcessed = FALSE;
+    bool bProcessed = false;

 
     switch (nId)
     {
 
     switch (nId)
     {


@@ -952,22 +942,22 @@ bool wxFrame::HandleSize(
             //
             // restore all child frames too
             //
             //
             // restore all child frames too
             //

-            IconizeChildFrames(FALSE);
-            (void)SendIconizeEvent(FALSE);
+            IconizeChildFrames(false);
+            (void)SendIconizeEvent(false);

 
             //
             // fall through
             //
 
         case kSizeMax:
 
             //
             // fall through
             //
 
         case kSizeMax:

-            m_bIconized = FALSE;
+            m_bIconized = false;

             break;
 
         case kSizeMin:
             //
             // Iconize all child frames too
             //
             break;
 
         case kSizeMin:
             //
             // Iconize all child frames too
             //

-            IconizeChildFrames(TRUE);
+            IconizeChildFrames(true);

             (void)SendIconizeEvent();
             m_bIconized = true;
             break;
             (void)SendIconizeEvent();
             m_bIconized = true;
             break;


@@ -1044,11 +1034,9 @@ bool wxFrame::HandleCommand( WXWORD nId,
     return false;
 } // end of wxFrame::HandleCommand
 
     return false;
 } // end of wxFrame::HandleCommand
 

-bool wxFrame::HandleMenuSelect(
-  WXWORD                            nItem
-, WXWORD                            nFlags
-, WXHMENU                           hMenu
-)
+bool wxFrame::HandleMenuSelect( WXWORD nItem,
+                                WXWORD nFlags,
+                                WXHMENU hMenu )

 {
     if( !nFlags )
     {
 {
     if( !nFlags )
     {


@@ -1062,30 +1050,28 @@ bool wxFrame::HandleMenuSelect(
             wxMenuEvent                     vEvent(wxEVT_MENU_HIGHLIGHT, nItem);
 
             vEvent.SetEventObject(this);
             wxMenuEvent                     vEvent(wxEVT_MENU_HIGHLIGHT, nItem);
 
             vEvent.SetEventObject(this);

-            GetEventHandler()->ProcessEvent(vEvent); // return value would be ignored by PM
+            HandleWindowEvent(vEvent); // return value would be ignored by PM

         }
         else
         {
         }
         else
         {

-            DoGiveHelp(wxEmptyString, FALSE);
-            return FALSE;
+            DoGiveHelp(wxEmptyString, true);
+            return false;

         }
     }
         }
     }

-    return TRUE;
+    return true;

 } // end of wxFrame::HandleMenuSelect
 
 // ---------------------------------------------------------------------------
 // Main Frame window proc
 // ---------------------------------------------------------------------------
 } // end of wxFrame::HandleMenuSelect
 
 // ---------------------------------------------------------------------------
 // Main Frame window proc
 // ---------------------------------------------------------------------------

-MRESULT EXPENTRY wxFrameMainWndProc(
-  HWND                              hWnd
-, ULONG                             ulMsg
-, MPARAM                            wParam
-, MPARAM                            lParam
-)
+MRESULT EXPENTRY wxFrameMainWndProc( HWND   hWnd,
+                                     ULONG  ulMsg,
+                                     MPARAM wParam,
+                                     MPARAM lParam )

 {
 {

-    MRESULT                         rc = (MRESULT)0;
-    bool                            bProcessed = FALSE;
-    wxFrame*                        pWnd  = NULL;
+    MRESULT  rc = (MRESULT)0;
+    bool     bProcessed = false;
+    wxFrame* pWnd  = NULL;

 
     pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
     switch (ulMsg)
 
     pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
     switch (ulMsg)


@@ -1137,25 +1123,39 @@ MRESULT EXPENTRY wxFrameMainWndProc(
                 {
                     if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd)
                     {
                 {
                     if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd)
                     {

-                        if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_HORIZONTAL)
+                        if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_TOP)

                         {
                             pSWP[i].x    = vRectl.xLeft;
                             pSWP[i].y    = vRectl.yBottom + nHeight;
                             pSWP[i].cx   = vRectl.xRight - vRectl.xLeft;
                             pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
                         }
                         {
                             pSWP[i].x    = vRectl.xLeft;
                             pSWP[i].y    = vRectl.yBottom + nHeight;
                             pSWP[i].cx   = vRectl.xRight - vRectl.xLeft;
                             pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
                         }

-                        else
+                        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 if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_LEFT)

                         {
                             pSWP[i].x    = vRectl.xLeft + nWidth;
                             pSWP[i].y    = vRectl.yBottom + nHeight;
                             pSWP[i].cx   = vRectl.xRight - (vRectl.xLeft + nWidth);
                             pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - nHeight;
                         }
                         {
                             pSWP[i].x    = vRectl.xLeft + nWidth;
                             pSWP[i].y    = vRectl.yBottom + nHeight;
                             pSWP[i].cx   = vRectl.xRight - (vRectl.xLeft + nWidth);
                             pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - nHeight;
                         }

+                        else
+                        {
+                            pSWP[i].x    = vRectl.xLeft;
+                            pSWP[i].y    = vRectl.yBottom + nHeight;
+                            pSWP[i].cx   = vRectl.xRight - (vRectl.xLeft + nWidth);
+                            pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - nHeight;
+                        }

                         pSWP[i].fl   = SWP_SIZE | SWP_MOVE | SWP_SHOW;
                         pSWP[i].hwndInsertBehind = HWND_TOP;
                     }
                 }
                         pSWP[i].fl   = SWP_SIZE | SWP_MOVE | SWP_SHOW;
                         pSWP[i].hwndInsertBehind = HWND_TOP;
                     }
                 }

-                bProcessed = TRUE;
+                bProcessed = true;

                 rc = MRFROMSHORT(nItemCount);
             }
             break;
                 rc = MRFROMSHORT(nItemCount);
             }
             break;


@@ -1211,14 +1211,12 @@ MRESULT EXPENTRY wxFrameWndProc(
     return rc;
 } // end of wxFrameWndProc
 
     return rc;
 } // end of wxFrameWndProc
 

-MRESULT wxFrame::OS2WindowProc(
-  WXUINT                            uMessage
-, WXWPARAM                          wParam
-, WXLPARAM                          lParam
-)
+MRESULT wxFrame::OS2WindowProc( WXUINT uMessage,
+                                WXWPARAM wParam,
+                                WXLPARAM lParam )

 {
 {

-    MRESULT                         mRc = 0L;
-    bool                            bProcessed = FALSE;
+    MRESULT mRc = 0L;
+    bool    bProcessed = false;

 
     switch (uMessage)
     {
 
     switch (uMessage)
     {


@@ -1304,7 +1302,7 @@ MRESULT wxFrame::OS2WindowProc(
                 const wxIcon&           vIcon = GetIcon();
                 HPOINTER                hIcon;
 
                 const wxIcon&           vIcon = GetIcon();
                 HPOINTER                hIcon;
 

-                if (vIcon.Ok())
+                if (vIcon.IsOk())

                     hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
                 else
                     hIcon = (HPOINTER)m_hDefaultIcon;
                     hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
                 else
                     hIcon = (HPOINTER)m_hDefaultIcon;


@@ -1327,12 +1325,10 @@ void wxFrame::SetClient(WXHWND WXUNUSED(c_Hwnd))
    // Duh...nothing to do under OS/2
 }
 
    // Duh...nothing to do under OS/2
 }
 

-void wxFrame::SetClient(
-  wxWindow*                         pWindow
-)
+void wxFrame::SetClient( wxWindow* pWindow )

 {
 {

-    wxWindow*                       pOldClient      = this->GetClient();
-    bool                            bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());
+    wxWindow* pOldClient      = this->GetClient();
+    bool      bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());

 
     if(pOldClient == pWindow)  // nothing to do
         return;
 
     if(pOldClient == pWindow)  // nothing to do
         return;


@@ -1344,8 +1340,8 @@ void wxFrame::SetClient(
         if(bClientHasFocus )
             this->SetFocus();
 
         if(bClientHasFocus )
             this->SetFocus();
 

-        pOldClient->Enable( FALSE );
-        pOldClient->Show( FALSE );
+        pOldClient->Enable( false );
+        pOldClient->Show( false );

         ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
         // to avoid OS/2 bug need to update frame
         ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0);
         ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
         // to avoid OS/2 bug need to update frame
         ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0);


@@ -1361,8 +1357,8 @@ void wxFrame::SetClient(
     ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE);
     if(pOldClient)
     {
     ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE);
     if(pOldClient)
     {

-        pOldClient->Enable(FALSE);
-        pOldClient->Show(FALSE);
+        pOldClient->Enable(false);
+        pOldClient->Show(false);

         ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
     }
     pWindow->Reparent(this);
         ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
     }
     pWindow->Reparent(this);


@@ -1382,20 +1378,3 @@ wxWindow* wxFrame::GetClient()
     return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
 }
 
     return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
 }
 

-void wxFrame::SendSizeEvent()
-{
-    if (!m_bIconized)
-    {
-        RECTL                       vRect = wxGetWindowRect(GetHwnd());
-
-        ::WinPostMsg( GetHwnd()
-                     ,WM_SIZE
-                     ,MPFROM2SHORT( vRect.xRight - vRect.xLeft
-                                   ,vRect.xRight - vRect.xLeft
-                                  )
-                     ,MPFROM2SHORT( vRect.yTop - vRect.yBottom
-                                   ,vRect.yTop - vRect.yBottom
-                                  )
-                    );
-    }
-}