X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..166c3ef0f9a77a66143968be2c1b58747994d32e:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index df4efda67e..38c03e700b 100644 --- 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: @@ -13,7 +13,6 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP - #include "wx/defs.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/setup.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/toolbar.h" + #include "wx/statusbr.h" + #include "wx/menuitem.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 // ---------------------------------------------------------------------------- -extern wxList WXDLLEXPORT wxPendingDelete; - #if wxUSE_MENUS_NATIVE extern wxMenu *wxCurrentPopupMenu; #endif -extern void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); - // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- @@ -83,7 +66,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) #if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_bUseNativeStatusBar = true; #else - bool wxFrame::m_bUseNativeStatusBar = FALSE; + bool wxFrame::m_bUseNativeStatusBar = false; #endif #endif //wxUSE_STATUSBAR @@ -98,7 +81,7 @@ void wxFrame::Init() m_nFsStatusBarHeight = 0; m_nFsToolBarHeight = 0; m_hWndToolTip = 0L; - m_bWasMinimized = FALSE; + m_bWasMinimized = false; m_frameMenuBar = NULL; @@ -118,7 +101,7 @@ void wxFrame::Init() 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 @@ -236,19 +219,14 @@ wxStatusBar* wxFrame::OnCreateStatusBar( int nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY()); - pStatusBar->SetSize( -1 - ,-1 - ,-1 + pStatusBar->SetSize( wxDefaultCoord + ,wxDefaultCoord + ,wxDefaultCoord ,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 // @@ -302,7 +280,7 @@ void wxFrame::PositionStatusBar() { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError(_T("Error setting parent for StautsBar. Error: %s\n"), sError.c_str()); + wxLogError(_T("Error setting parent for StatusBar. Error: %s\n"), sError.c_str()); return; } } @@ -310,24 +288,15 @@ void wxFrame::PositionStatusBar() #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 ); - ::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 @@ -480,7 +449,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle ) if (bShow) { if (IsFullScreen()) - return FALSE; + return false; m_bFsIsShowing = true; m_lFsStyle = lStyle; @@ -511,8 +480,8 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle ) // if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar) { - pTheToolBar->SetSize(-1,0); - pTheToolBar->Show(FALSE); + pTheToolBar->SetSize(wxDefaultCoord,0); + pTheToolBar->Show(false); } #endif //wxUSE_TOOLBAR @@ -580,7 +549,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle ) ::WinQueryWindowRect(HWND_DESKTOP, &vRect); nWidth = vRect.xRight - vRect.xLeft; // - // Rmember OS/2 is backwards! + // Remember OS/2 is backwards! // nHeight = vRect.yTop - vRect.yBottom; @@ -619,7 +588,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle ) // if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR)) { - pTheToolBar->SetSize(-1, m_nFsToolBarHeight); + pTheToolBar->SetSize(wxDefaultCoord, m_nFsToolBarHeight); pTheToolBar->Show(true); } #endif //wxUSE_TOOLBAR @@ -735,6 +704,22 @@ void wxFrame::PositionToolBar() ,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; @@ -817,23 +802,21 @@ WXHICON wxFrame::GetDefaultIcon() const // --------------------------------------------------------------------------- // preprocessing // --------------------------------------------------------------------------- -bool wxFrame::OS2TranslateMessage( - WXMSG* pMsg -) +bool wxFrame::OS2TranslateMessage( WXMSG* pMsg ) { // // try the menu bar accels // - wxMenuBar* pMenuBar = GetMenuBar(); + wxMenuBar* pMenuBar = GetMenuBar(); if (!pMenuBar) - return FALSE; + return false; #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 @@ -877,16 +860,12 @@ bool wxFrame::HandlePaint() ::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); -#endif } ::WinEndPaint(hPs); } @@ -931,13 +910,9 @@ bool 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) { @@ -952,22 +927,22 @@ bool wxFrame::HandleSize( // // restore all child frames too // - IconizeChildFrames(FALSE); - (void)SendIconizeEvent(FALSE); + IconizeChildFrames(false); + (void)SendIconizeEvent(false); // // fall through // case kSizeMax: - m_bIconized = FALSE; + m_bIconized = false; break; case kSizeMin: // // Iconize all child frames too // - IconizeChildFrames(TRUE); + IconizeChildFrames(true); (void)SendIconizeEvent(); m_bIconized = true; break; @@ -1044,11 +1019,9 @@ bool wxFrame::HandleCommand( WXWORD nId, 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 ) { @@ -1066,26 +1039,24 @@ bool wxFrame::HandleMenuSelect( } else { - DoGiveHelp(wxEmptyString, FALSE); - return FALSE; + DoGiveHelp(wxEmptyString, false); + return false; } } - return TRUE; + return true; } // 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) @@ -1144,6 +1115,13 @@ MRESULT EXPENTRY wxFrameMainWndProc( 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; @@ -1155,7 +1133,7 @@ MRESULT EXPENTRY wxFrameMainWndProc( pSWP[i].hwndInsertBehind = HWND_TOP; } } - bProcessed = TRUE; + bProcessed = true; rc = MRFROMSHORT(nItemCount); } break; @@ -1211,14 +1189,12 @@ MRESULT EXPENTRY 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) { @@ -1327,12 +1303,10 @@ void wxFrame::SetClient(WXHWND WXUNUSED(c_Hwnd)) // 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; @@ -1344,8 +1318,8 @@ void wxFrame::SetClient( 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); @@ -1361,8 +1335,8 @@ void wxFrame::SetClient( ::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);