X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b720b24da89b6b60dbabde36f2a995357e3b1497..8d36b2167df7e86ecfc58d148eaf6abe0a5b7971:/src/os2/window.cpp diff --git a/src/os2/window.cpp b/src/os2/window.cpp index f7fcfaead5..977e27bc94 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -27,14 +27,19 @@ #include "wx/app.h" #include "wx/panel.h" #include "wx/layout.h" + #include "wx/checkbox.h" + #include "wx/combobox.h" #include "wx/dialog.h" #include "wx/frame.h" #include "wx/listbox.h" #include "wx/button.h" + #include "wx/bmpbuttn.h" #include "wx/msgdlg.h" #include "wx/scrolwin.h" #include "wx/radiobox.h" + #include "wx/radiobut.h" #include "wx/slider.h" + #include "wx/statbox.h" #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/settings.h" @@ -58,6 +63,10 @@ #include "wx/tooltip.h" #endif +#if wxUSE_NOTEBOOK + #include "wx/notebook.h" +#endif + #if wxUSE_CARET #include "wx/caret.h" #endif // wxUSE_CARET @@ -119,8 +128,6 @@ QMSG s_currentMsg; wxMenu* wxCurrentPopupMenu = NULL; #endif // wxUSE_MENUS_NATIVE -wxList* wxWinHandleList = NULL; - // --------------------------------------------------------------------------- // private functions // --------------------------------------------------------------------------- @@ -171,7 +178,6 @@ static wxWindow* gpWinBeingCreated = NULL; BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground) EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindowOS2::OnInitDialog) EVT_IDLE(wxWindowOS2::OnIdle) EVT_SET_FOCUS(wxWindowOS2::OnSetFocus) END_EVENT_TABLE() @@ -210,17 +216,17 @@ wxWindow* wxWindowOS2::FindItem( } #endif // wxUSE_CONTROLS - wxWindowList::Node* pCurrent = GetChildren().GetFirst(); + wxWindowList::compatibility_iterator current = GetChildren().GetFirst(); - while (pCurrent) + while (current) { - wxWindow* pChildWin = pCurrent->GetData(); + wxWindow* pChildWin = current->GetData(); wxWindow* pWnd = pChildWin->FindItem(lId); if (pWnd) return pWnd; - pCurrent = pCurrent->GetNext(); + current = current->GetNext(); } return(NULL); } // end of wxWindowOS2::FindItem @@ -233,11 +239,11 @@ wxWindow* wxWindowOS2::FindItemByHWND( , bool bControlOnly ) const { - wxWindowList::Node* pCurrent = GetChildren().GetFirst(); + wxWindowList::compatibility_iterator current = GetChildren().GetFirst(); - while (pCurrent) + while (current) { - wxWindow* pParent = pCurrent->GetData(); + wxWindow* pParent = current->GetData(); // // Do a recursive search. @@ -253,7 +259,7 @@ wxWindow* wxWindowOS2::FindItemByHWND( #endif // wxUSE_CONTROLS ) { - wxWindow* pItem = pCurrent->GetData(); + wxWindow* pItem = current->GetData(); if (pItem->GetHWND() == hWnd) return(pItem); @@ -263,7 +269,7 @@ wxWindow* wxWindowOS2::FindItemByHWND( return(pItem); } } - pCurrent = pCurrent->GetNext(); + current = current->GetNext(); } return(NULL); } // end of wxWindowOS2::FindItemByHWND @@ -285,21 +291,16 @@ bool wxWindowOS2::OS2Command( void wxWindowOS2::Init() { - // - // Generic - // - InitBase(); - // // PM specific // m_bWinCaptured = FALSE; - m_isBeingDeleted = FALSE; m_fnOldWndProc = NULL; m_bUseCtl3D = FALSE; m_bMouseInWindow = FALSE; m_bLastKeydownProcessed = FALSE; + m_pChildrenDisabled = NULL; // // wxWnd @@ -352,9 +353,6 @@ wxWindowOS2::~wxWindowOS2() DestroyChildren(); - if (m_parent) - m_parent->RemoveChild(this); - if (m_hWnd) { if(!::WinDestroyWindow(GetHWND())) @@ -364,6 +362,7 @@ wxWindowOS2::~wxWindowOS2() // wxRemoveHandleAssociation(this); } + delete m_pChildrenDisabled; } // end of wxWindowOS2::~wxWindowOS2 // real construction (Init() must have been called before!) @@ -407,8 +406,6 @@ bool wxWindowOS2::Create( if (pParent) { - int nTempy; - pParent->AddChild(this); hParent = GetWinHwnd(pParent); @@ -423,7 +420,7 @@ bool wxWindowOS2::Create( // set in those class create procs. PM's basic windows styles are // very limited. // - ulCreateFlags |= WS_VISIBLE | OS2GetCreateWindowFlags(&dwExStyle); + ulCreateFlags |= OS2GetCreateWindowFlags(&dwExStyle); #ifdef __WXUNIVERSAL__ @@ -432,29 +429,27 @@ bool wxWindowOS2::Create( #endif // !wxUniversal if (lStyle & wxPOPUP_WINDOW) { - // a popup window floats on top of everything - // it is also created hidden as other top level windows ulCreateFlags &= ~WS_VISIBLE; m_isShown = FALSE; } + else + { + ulCreateFlags |= WS_VISIBLE; + } // // Generic OS/2 Windows have no Control Data but other classes // that call OS2Create may have some. // - bool bRetVal = OS2Create( (PSZ)wxCanvasClassName - ,rName.c_str() - ,ulCreateFlags - ,rPos - ,rSize - ,NULL // Control Data - ,dwExStyle - ,TRUE // Child - ); - - if (bRetVal) - ::WinSubclassWindow(m_hWnd, (PFNWP)wxWndProc); - return(bRetVal); + return(OS2Create( (PSZ)wxCanvasClassName + ,rName.c_str() + ,ulCreateFlags + ,rPos + ,rSize + ,NULL // Control Data + ,dwExStyle + ,TRUE // Child + )); } // end of wxWindowOS2::Create // --------------------------------------------------------------------------- @@ -478,7 +473,7 @@ void wxWindowOS2::SetFocusFromKbd() wxWindowBase::SetFocusFromKbd(); } // end of wxWindowOS2::SetFocus -wxWindow* wxWindowBase::FindFocus() +wxWindow* wxWindowBase::DoFindFocus() { HWND hWnd = ::WinQueryFocus(HWND_DESKTOP); @@ -487,7 +482,7 @@ wxWindow* wxWindowBase::FindFocus() return wxFindWinFromHandle((WXHWND)hWnd); } return NULL; -} // wxWindowBase::FindFocus +} // wxWindowBase::DoFindFocus bool wxWindowOS2::Enable( bool bEnable @@ -501,14 +496,57 @@ bool wxWindowOS2::Enable( if ( hWnd ) ::WinEnableWindow(hWnd, (BOOL)bEnable); - wxWindowList::Node* pNode = GetChildren().GetFirst(); + // + // The logic below doesn't apply to the top level windows -- otherwise + // showing a modal dialog would result in total greying out (and ungreying + // out later) of everything which would be really ugly + // + if (IsTopLevel()) + return TRUE; + + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while (pNode) + while (node) { - wxWindow* pChild = pNode->GetData(); + wxWindow* pChild = node->GetData(); - pChild->Enable(bEnable); - pNode = pNode->GetNext(); + if (bEnable) + { + // + // Enable the child back unless it had been disabled before us + // + if (!m_pChildrenDisabled || !m_pChildrenDisabled->Find(pChild)) + pChild->Enable(); + } + else // we're being disabled + { + if (pChild->IsEnabled()) + { + // + // Disable it as children shouldn't stay enabled while the + // parent is not + // + pChild->Disable(); + } + else // child already disabled, remember it + { + // + // Have we created the list of disabled children already? + // + if (!m_pChildrenDisabled) + m_pChildrenDisabled = new wxWindowList; + m_pChildrenDisabled->Append(pChild); + } + } + node = node->GetNext(); + } + if (bEnable && m_pChildrenDisabled) + { + // + // We don't need this list any more, don't keep unused memory + // + delete m_pChildrenDisabled; + m_pChildrenDisabled = NULL; } return TRUE; } // end of wxWindowOS2::Enable @@ -639,81 +677,11 @@ void wxWindowOS2::WarpPointer( ::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY)); } // end of wxWindowOS2::WarpPointer -#if WXWIN_COMPATIBILITY -void wxWindowOS2::OS2DeviceToLogical (float *x, float *y) const -{ -} -#endif // WXWIN_COMPATIBILITY // --------------------------------------------------------------------------- // scrolling stuff // --------------------------------------------------------------------------- -#if WXWIN_COMPATIBILITY -void wxWindowOS2::SetScrollRange( - int nOrient -, int nRange -, bool bRefresh -) -{ - int nRange1 = nRange; - int nPageSize = GetScrollPage(nOrient); - - if (nPpageSize > 1 && nRange > 0) - { - nRange1 += (nPageSize - 1); - } - - if (nOrient == wxHORIZONTAL) - { - ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1)); - ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0); - } - else - { - ::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1)); - ::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0); - } -} // end of wxWindowOS2::SetScrollRange - -void wxWindowOS2::SetScrollPage( - int nOrient -, int nPage -, bool bRefresh -) -{ - if (nOrient == wxHORIZONTAL ) - m_nXThumbSize = nPage; - else - m_nYThumbSize = nPage; -} // end of wxWindowOS2::SetScrollPage - -int wxWindowOS2::OldGetScrollRange( - int nOrient -) const -{ - MRESULT mRc; - HWND hWnd = GetHwnd(); - - if (hWnd) - { - mRc = WinSendMsg(hWnd, SBM_QUERYRANGE, (MPARAM)0L, (MPARAM)0L); - return(SHORT2FROMMR(mRc)); - } - return 0; -} // end of wxWindowOS2::OldGetScrollRange - -int wxWindowOS2::GetScrollPage( - int nOrient -) const -{ - if (nOrient == wxHORIZONTAL) - return m_nXThumbSize; - else - return m_nYThumbSize; -} // end of wxWindowOS2::GetScrollPage -#endif // WXWIN_COMPATIBILITY - int wxWindowOS2::GetScrollPos( int nOrient ) const @@ -776,7 +744,6 @@ void wxWindowOS2::SetScrollbar( ULONG ulStyle = WS_VISIBLE | WS_SYNCPAINT; SWP vSwp; SWP vSwpOwner; - RECTL vRect; HWND hWndParent; HWND hWndClient; wxWindow* pParent = GetParent(); @@ -968,20 +935,15 @@ void wxWindowOS2::ScrollWindow( ) { RECTL vRect; - RECTL vRectHorz; - RECTL vRectVert; - RECTL vRectChild; + ::WinQueryWindowRect(GetHwnd(), &vRect); + int height = vRect.yTop; if (pRect) { vRect.xLeft = pRect->x; - vRect.yTop = pRect->y + pRect->height; + vRect.yTop = height - pRect->y; vRect.xRight = pRect->x + pRect->width; - vRect.yBottom = pRect->y; - } - else - { - ::WinQueryWindowRect(GetHwnd(), &vRect); + vRect.yBottom = vRect.yTop - pRect->height; } nDy *= -1; // flip the sign of Dy as OS/2 is opposite Windows. ::WinScrollWindow( GetHwnd() @@ -989,11 +951,10 @@ void wxWindowOS2::ScrollWindow( ,(LONG)nDy ,&vRect ,&vRect - ,NULLHANDLE + ,NULL ,NULL ,SW_SCROLLCHILDREN | SW_INVALIDATERGN ); - Refresh(); } // end of wxWindowOS2::ScrollWindow // --------------------------------------------------------------------------- @@ -1120,7 +1081,7 @@ WXDWORD wxWindowOS2::OS2GetStyle( } // end of wxWindowMSW::MSWGetStyle // -// Make a Windows extended style from the given wxWindows window style +// Make a Windows extended style from the given wxWidgets window style // WXDWORD wxWindowOS2::MakeExtendedStyle( long lStyle @@ -1150,118 +1111,6 @@ WXDWORD wxWindowOS2::MakeExtendedStyle( return dwStyle; } // end of wxWindowOS2::MakeExtendedStyle -// -// Determines whether simulated 3D effects or CTL3D should be used, -// applying a default border style if required, and returning an extended -// style to pass to OS2Create. -// -WXDWORD wxWindowOS2::Determine3DEffects( - WXDWORD dwDefaultBorderStyle -, bool* pbWant3D -) const -{ - WXDWORD dwStyle = 0L; - - // - // Native PM does not have any specialize 3D effects like WIN32 does, - // so we have to try and invent them. - // - - // - // If matches certain criteria, then assume no 3D effects - // unless specifically requested (dealt with in MakeExtendedStyle) - // - if (!GetParent() || - !IsKindOf(CLASSINFO(wxControl)) || - (m_windowStyle & wxNO_BORDER) - ) - { - *pbWant3D = FALSE; - return MakeExtendedStyle(m_windowStyle, FALSE); - } - - // - // 1) App can specify global 3D effects - // - *pbWant3D = wxTheApp->GetAuto3D(); - - // - // 2) If the parent is being drawn with user colours, or simple border - // specified, switch effects off. - // - if (GetParent() && - (GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) || - (m_windowStyle & wxSIMPLE_BORDER) - ) - *pbWant3D = FALSE; - - // - // 3) Control can override this global setting by defining - // a border style, e.g. wxSUNKEN_BORDER - // - if ((m_windowStyle & wxDOUBLE_BORDER) || - (m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSTATIC_BORDER) || - (m_windowStyle & wxSUNKEN_BORDER) - ) - *pbWant3D = TRUE; - - dwStyle = MakeExtendedStyle( m_windowStyle - ,FALSE - ); - - // - // If we want 3D, but haven't specified a border here, - // apply the default border style specified. - // - if (dwDefaultBorderStyle && (*pbWant3D) && - !((m_windowStyle & wxDOUBLE_BORDER) || - (m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSTATIC_BORDER) || - (m_windowStyle & wxSIMPLE_BORDER) - ) - ) - dwStyle |= dwDefaultBorderStyle; - return dwStyle; -} // end of wxWindowOS2::Determine3DEffects - -#if WXWIN_COMPATIBILITY -void wxWindowOS2::OnCommand( - wxWindow& rWin -, wxCommandEvent& rEvent -) -{ - if (GetEventHandler()->ProcessEvent(rEvent)) - return; - if (m_parent) - m_parent->GetEventHandler()->OnCommand( rWin - ,rEvent - ); -} // end of wxWindowOS2::OnCommand - -wxObject* wxWindowOS2::GetChild( - int nNumber -) const -{ - // - // Return a pointer to the Nth object in the Panel - // - wxNode* pNode = GetChildren().First(); - int n = nNumber; - - while (pNode && n--) - pNode = pNode->Next(); - if (pNode) - { - wxObject* pObj = (wxObject*)pNode->Data(); - return(pObj); - } - else - return NULL; -} // end of wxWindowOS2::GetChild - -#endif // WXWIN_COMPATIBILITY - // // Setup background and foreground colours correctly // @@ -1297,10 +1146,10 @@ void wxWindowOS2::OnIdle( // int nState = 0; - if (::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) != 0) - nState |= VK_SHIFT; - if (::WinGetKeyState(HWND_DESKTOP, VK_CTRL) != 0); - nState |= VK_CTRL; + if (IsShiftDown()) + nState |= KC_SHIFT; + if (IsCtrlDown()) + nState |= KC_CTRL; wxMouseEvent rEvent(wxEVT_LEAVE_WINDOW); @@ -1312,7 +1161,8 @@ void wxWindowOS2::OnIdle( (void)GetEventHandler()->ProcessEvent(rEvent); } } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } // end of wxWindowOS2::OnIdle // @@ -1332,17 +1182,6 @@ bool wxWindowOS2::Reparent( return TRUE; } // end of wxWindowOS2::Reparent -void wxWindowOS2::Clear() -{ - wxClientDC vDc((wxWindow*)this); - wxBrush vBrush( GetBackgroundColour() - ,wxSOLID - ); - - vDc.SetBackground(vBrush); - vDc.Clear(); -} // end of wxWindowOS2::Clear - void wxWindowOS2::Update() { ::WinUpdateWindow(GetHwnd()); @@ -1376,11 +1215,14 @@ void wxWindowOS2::Refresh( if (pRect) { RECTL vOs2Rect; + int height; + ::WinQueryWindowRect(GetHwnd(), &vOs2Rect); + height = vOs2Rect.yTop; vOs2Rect.xLeft = pRect->x; - vOs2Rect.yTop = pRect->y; + vOs2Rect.yTop = height - pRect->y; vOs2Rect.xRight = pRect->x + pRect->width; - vOs2Rect.yBottom = pRect->y + pRect->height; + vOs2Rect.yBottom = vOs2Rect.yTop - pRect->height; ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack); } @@ -1402,14 +1244,7 @@ void wxWindowOS2::SetDropTarget( wxDropTarget* pDropTarget ) { - if (m_dropTarget != 0) - { - m_dropTarget->Revoke(m_hWnd); - delete m_dropTarget; - } m_dropTarget = pDropTarget; - if (m_dropTarget != 0) - m_dropTarget->Register(m_hWnd); } // end of wxWindowOS2::SetDropTarget #endif @@ -1633,9 +1468,18 @@ void wxWindowOS2::DoMoveWindow( ) { RECTL vRect; - HWND hParent; wxWindow* pParent = GetParent(); + /* Due to OS/2's inverted coordinate system, changing the height + of a window requires repositioning all it's children, e.g. if + you want a child of height 100 to be at the top left corner of + the parent you need to position the lower left corner of the + child at (0, (height of parent - 100)), so, obviously, if the + height of the parent changes, the child needs to be repositioned. */ + int nHeightDelta; + GetSize(0, &nHeightDelta); + nHeightDelta = nHeight - nHeightDelta; + if (pParent && !IsKindOf(CLASSINFO(wxDialog))) { int nOS2Height = GetOS2ParentHeight(pParent); @@ -1649,13 +1493,85 @@ void wxWindowOS2::DoMoveWindow( ::WinQueryWindowRect(HWND_DESKTOP, &vRect); nY = vRect.yTop - (nY + nHeight); } + + // + // In the case of a frame whose client is sized, the client cannot be + // large than its parent frame minus its borders! This usually happens + // when using an autosizer to size a frame to precisely hold client + // controls as in the notebook sample. + // + // In this case, we may need to resize both a frame and its client so we + // need a quick calc of the frame border size, then if the frame + // (less its borders) is smaller than the client, size the frame to + // encompass the client with the appropriate border size. + // + if (IsKindOf(CLASSINFO(wxFrame))) + { + RECTL vFRect; + HWND hWndFrame; + int nWidthFrameDelta = 0; + int nHeightFrameDelta = 0; + int nHeightFrame = 0; + int nWidthFrame = 0; + wxFrame* pFrame; + + pFrame = wxDynamicCast(this, wxFrame); + hWndFrame = pFrame->GetFrame(); + ::WinQueryWindowRect(hWndFrame, &vRect); + ::WinMapWindowPoints(hWndFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2); + vFRect = vRect; + ::WinCalcFrameRect(hWndFrame, &vRect, TRUE); + nWidthFrameDelta = ((vRect.xLeft - vFRect.xLeft) + (vFRect.xRight - vRect.xRight)); + nHeightFrameDelta = ((vRect.yBottom - vFRect.yBottom) + (vFRect.yTop - vRect.yTop)); + nWidthFrame = vFRect.xRight - vFRect.xLeft; + nHeightFrame = vFRect.yTop - vFRect.yBottom; + + if (nWidth == vFRect.xRight - vFRect.xLeft && + nHeight == vFRect.yTop - vFRect.yBottom) + { + // + // In this case the caller is not aware of OS/2's need to size both + // the frame and it's client and is really only moving the window, + // not resizeing it. So move the frame, and back off the sizes + // for a proper client fit. + // + ::WinSetWindowPos( hWndFrame + ,HWND_TOP + ,(LONG)nX - (vRect.xLeft - vFRect.xLeft) + ,(LONG)nY - (vRect.yBottom - vFRect.yBottom) + ,(LONG)0 + ,(LONG)0 + ,SWP_MOVE + ); + nX += (vRect.xLeft - vFRect.xLeft); + nY += (vRect.yBottom - vFRect.yBottom); + nWidth -= nWidthFrameDelta; + nHeight -= nHeightFrameDelta; + } + else + { + if (nWidth > nWidthFrame - nHeightFrameDelta || + nHeight > nHeightFrame - nHeightFrameDelta) + { + ::WinSetWindowPos( hWndFrame + ,HWND_TOP + ,(LONG)nX - (vRect.xLeft - vFRect.xLeft) + ,(LONG)nY - (vRect.yBottom - vFRect.yBottom) + ,(LONG)nWidth + nWidthFrameDelta + ,(LONG)nHeight + nHeightFrameDelta + ,SWP_MOVE | SWP_SIZE + ); + } + } + } + ::WinSetWindowPos( GetHwnd() ,HWND_TOP ,(LONG)nX ,(LONG)nY ,(LONG)nWidth ,(LONG)nHeight - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW + ,SWP_SIZE | SWP_MOVE ); if (m_vWinSwp.cx == 0 && m_vWinSwp.cy == 0 && m_vWinSwp.fl == 0) // @@ -1712,6 +1628,7 @@ void wxWindowOS2::DoMoveWindow( MoveChildren(nYDiff); ::WinQueryWindowPos(GetHwnd(), &m_vWinSwp); } + MoveChildren(nHeightDelta); } // end of wxWindowOS2::DoMoveWindow // @@ -1751,7 +1668,6 @@ void wxWindowOS2::DoSetSize( // Must convert Y coords to test for equality under OS/2 // int nY2 = nY; - wxWindow* pParent = (wxWindow*)GetParent(); if (nX == nCurrentX && nY2 == nCurrentY && nWidth == nCurrentWidth && nHeight == nCurrentHeight) @@ -1870,11 +1786,6 @@ void wxWindowOS2::DoSetClientSize( GetEventHandler()->ProcessEvent(vEvent); } // end of wxWindowOS2::DoSetClientSize -wxPoint wxWindowOS2::GetClientAreaOrigin() const -{ - return wxPoint(0, 0); -} // end of wxWindowOS2::GetClientAreaOrigin - // --------------------------------------------------------------------------- // text metrics // --------------------------------------------------------------------------- @@ -1926,9 +1837,8 @@ void wxWindowOS2::GetTextExtent( int i; int l; FONTMETRICS vFM; // metrics structure - BOOL bRc; + BOOL bRc = FALSE; char* pStr; - ERRORID vErrorCode; // last error id code HPS hPS; @@ -2029,89 +1939,11 @@ bool wxWindowOS2::IsMouseInWindow() const return hWnd != NULL; } // end of wxWindowOS2::IsMouseInWindow -#if wxUSE_CARET && WXWIN_COMPATIBILITY -// --------------------------------------------------------------------------- -// Caret manipulation -// --------------------------------------------------------------------------- - -void wxWindowOS2::CreateCaret( - int nWidth -, int nHeight -) -{ - SetCaret(new wxCaret( this - ,nWidth - ,nHeight - )); -} // end of wxWindowOS2::CreateCaret - -void wxWindowOS2::CreateCaret( - const wxBitmap* pBitmap -) -{ - wxFAIL_MSG("not implemented"); -} // end of wxWindowOS2::CreateCaret - -void wxWindowOS2::ShowCaret( - bool bShow -) -{ - wxCHECK_RET( m_caret, "no caret to show" ); - - m_caret->Show(bShow); -} // end of wxWindowOS2::ShowCaret - -void wxWindowOS2::DestroyCaret() -{ - SetCaret(NULL); -} // end of wxWindowOS2::DestroyCaret - -void wxWindowOS2::SetCaretPos( - int nX -, int nY) -{ - wxCHECK_RET( m_caret, "no caret to move" ); - - m_caret->Move( nX - ,nY - ); -} // end of wxWindowOS2::SetCaretPos - -void wxWindowOS2::GetCaretPos( - int* pX -, int* pY -) const -{ - wxCHECK_RET( m_caret, "no caret to get position of" ); - - m_caret->GetPosition( pX - ,pY - ); -} // end of wxWindowOS2::GetCaretPos - -#endif //wxUSE_CARET // --------------------------------------------------------------------------- // popup menu // --------------------------------------------------------------------------- // -#if wxUSE_MENUS_NATIVE -static void wxYieldForCommandsOnly() -{ - // - // Peek all WM_COMMANDs (it will always return WM_QUIT too but we don't - // want to process it here) - // - QMSG vMsg; - - while (::WinPeekMsg(vHabmain, &vMsg, (HWND)0, WM_COMMAND, WM_COMMAND, PM_REMOVE) - && vMsg.msg != WM_QUIT) - { - wxTheApp->DoMessage((WXMSG*)&vMsg); - } -} -#endif // wxUSE_MENUS_NATIVE - #if wxUSE_MENUS_NATIVE bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu @@ -2123,13 +1955,28 @@ bool wxWindowOS2::DoPopupMenu( HWND hWndParent = GetHwnd(); HWND hMenu = GetHmenuOf(pMenu); bool bIsWaiting = TRUE; + int nHeight; + + // Protect against recursion + if (wxCurrentPopupMenu) + return false; pMenu->SetInvokingWindow(this); pMenu->UpdateUI(); - DoClientToScreen( &nX - ,&nY - ); + if ( nX == -1 && nY == -1 ) + { + wxPoint mouse = wxGetMousePosition(); + nX = mouse.x; nY = mouse.y; + } + else + { + DoClientToScreen( &nX + ,&nY + ); + DoGetSize(0,&nHeight); + nY = nHeight - nY; + } wxCurrentPopupMenu = pMenu; ::WinPopupMenu( hWndParent @@ -2144,15 +1991,13 @@ bool wxWindowOS2::DoPopupMenu( while(bIsWaiting) { QMSG vMsg; - BOOL bRc = ::WinGetMsg(vHabmain, &vMsg, HWND(NULL), 0, 0); - if (vMsg.msg == WM_MENUEND || vMsg.msg == WM_COMMAND) - { + ::WinGetMsg(vHabmain,&vMsg, (HWND)0, 0, 0); + if (vMsg.msg == WM_COMMAND) bIsWaiting = FALSE; - } ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg); - } + wxCurrentPopupMenu = NULL; pMenu->SetInvokingWindow(NULL); return TRUE; @@ -2302,6 +2147,14 @@ bool wxWindowOS2::OS2ProcessMessage( pBtn->OS2Command(BN_CLICKED, 0 /* unused */); return TRUE; } + else if (!IsTopLevel()) + { + // + // if not a top level window, let parent + // handle it + // + return FALSE; + } // else: but if it does not it makes sense to make // it work like a TAB - and that's what we do. // Note that Ctrl-Enter always works this way. @@ -2433,7 +2286,7 @@ void wxWindowOS2::UnpackMenuSelect( } // end of wxWindowOS2::UnpackMenuSelect // --------------------------------------------------------------------------- -// Main wxWindows window proc and the window proc for wxWindow +// Main wxWidgets window proc and the window proc for wxWindow // --------------------------------------------------------------------------- // @@ -2452,14 +2305,6 @@ MRESULT EXPENTRY wxWndProc( , MPARAM lParam ) { - // - // Trace all ulMsgs - useful for the debugging - // -#ifdef __WXDEBUG__ - wxLogTrace(wxTraceMessages, wxT("Processing %s(wParam=%8lx, lParam=%8lx)"), - wxGetMessageName(ulMsg), wParam, lParam); -#endif // __WXDEBUG__ - wxWindowOS2* pWnd = wxFindWinFromHandle((WXHWND)hWnd); // @@ -2681,7 +2526,7 @@ MRESULT wxWindowOS2::OS2WindowProc( bProcessed = HandleMouseEvent( uMsg ,nX ,nY - ,(WXUINT)SHORT1FROMMP(wParam) + ,(WXUINT)SHORT2FROMMP(lParam) ); } else @@ -2690,10 +2535,15 @@ MRESULT wxWindowOS2::OS2WindowProc( ,&nX ,&nY ); + if (!pWin->IsOfStandardClass()) + { + if (uMsg == WM_BUTTON1DOWN && pWin->AcceptsFocus() ) + pWin->SetFocus(); + } bProcessed = pWin->HandleMouseEvent( uMsg ,nX ,nY - ,(WXUINT)SHORT1FROMMP(wParam) + ,(WXUINT)SHORT2FROMMP(lParam) ); } } @@ -2728,8 +2578,9 @@ MRESULT wxWindowOS2::OS2WindowProc( } else { - bProcessed = OS2OnMeasureItem(nIdCtrl, - (WXMEASUREITEMSTRUCT *)lParam); + return MRFROMLONG(OS2OnMeasureItem( nIdCtrl + ,(WXMEASUREITEMSTRUCT *)lParam + )); } if ( bProcessed ) @@ -2795,7 +2646,6 @@ MRESULT wxWindowOS2::OS2WindowProc( // Avoid duplicate messages to OnChar for these ASCII keys: they // will be translated by TranslateMessage() and received in WM_CHAR case VK_ESC: - case VK_SPACE: case VK_ENTER: case VK_BACKSPACE: case VK_TAB: @@ -2856,6 +2706,157 @@ MRESULT wxWindowOS2::OS2WindowProc( case WM_CONTROL: switch(SHORT2FROMMP(wParam)) { + case BN_PAINT: + { + HWND hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam)); + wxWindowOS2* pWin = wxFindWinFromHandle(hWnd); + + if (!pWin) + { + bProcessed = FALSE; + break; + } + if (pWin->IsKindOf(CLASSINFO(wxBitmapButton))) + { + wxBitmapButton* pBitmapButton = wxDynamicCast(pWin, wxBitmapButton); + + pBitmapButton->OS2OnDraw((WXDRAWITEMSTRUCT *)lParam); + } + return 0; + } + break; + + case BKN_PAGESELECTEDPENDING: + { + PPAGESELECTNOTIFY pPage = (PPAGESELECTNOTIFY)lParam; + + if ((pPage->ulPageIdNew != pPage->ulPageIdCur) && + (pPage->ulPageIdNew > 0L && pPage->ulPageIdCur > 0L)) + { + wxWindowOS2* pWin = wxFindWinFromHandle(pPage->hwndBook); + wxNotebookEvent vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED + ,(int)SHORT1FROMMP(wParam) + ,(int)pPage->ulPageIdNew + ,(int)pPage->ulPageIdCur + ); + if (!pWin) + { + bProcessed = FALSE; + break; + } + if (pWin->IsKindOf(CLASSINFO(wxNotebook))) + { + wxNotebook* pNotebook = wxDynamicCast(pWin, wxNotebook); + + vEvent.SetEventObject(pWin); + pNotebook->OnSelChange(vEvent); + bProcessed = TRUE; + } + else + bProcessed = FALSE; + } + else + bProcessed = FALSE; + } + break; + + case BN_CLICKED: // Dups as LN_SELECT and CBN_LBSELECT + { + HWND hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam)); + wxWindowOS2* pWin = wxFindWinFromHandle(hWnd); + + if (!pWin) + { + bProcessed = FALSE; + break; + } + // + // Simulate a WM_COMMAND here, as wxWidgets expects all control + // button clicks to generate WM_COMMAND msgs, not WM_CONTROL + // + if (pWin->IsKindOf(CLASSINFO(wxRadioBox))) + { + wxRadioBox* pRadioBox = wxDynamicCast(pWin, wxRadioBox); + + pRadioBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXUINT)SHORT1FROMMP(wParam) + ); + } + if (pWin->IsKindOf(CLASSINFO(wxRadioButton))) + { + wxRadioButton* pRadioButton = wxDynamicCast(pWin, wxRadioButton); + + pRadioButton->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXUINT)SHORT1FROMMP(wParam) + ); + } + if (pWin->IsKindOf(CLASSINFO(wxCheckBox))) + { + wxCheckBox* pCheckBox = wxDynamicCast(pWin, wxCheckBox); + + pCheckBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXUINT)SHORT1FROMMP(wParam) + ); + } + if (pWin->IsKindOf(CLASSINFO(wxListBox))) + { + wxListBox* pListBox = wxDynamicCast(pWin, wxListBox); + + pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXUINT)SHORT1FROMMP(wParam) + ); + if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW) + Refresh(); + } + if (pWin->IsKindOf(CLASSINFO(wxComboBox))) + { + wxComboBox* pComboBox = wxDynamicCast(pWin, wxComboBox); + + pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXUINT)SHORT1FROMMP(wParam) + ); + } + return 0; + } + break; + + case LN_ENTER: /* dups as CBN_EFCHANGE */ + { + HWND hWnd = HWNDFROMMP(lParam); + wxWindowOS2* pWin = wxFindWinFromHandle(hWnd); + + if (!pWin) + { + bProcessed = FALSE; + break; + } + // + // Simulate a WM_COMMAND here, as wxWidgets expects all control + // button clicks to generate WM_COMMAND msgs, not WM_CONTROL + // + if (pWin->IsKindOf(CLASSINFO(wxListBox))) + { + wxListBox* pListBox = wxDynamicCast(pWin, wxListBox); + + pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXUINT)SHORT1FROMMP(wParam) + ); + if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW) + Refresh(); + + } + if (pWin->IsKindOf(CLASSINFO(wxComboBox))) + { + wxComboBox* pComboBox = wxDynamicCast(pWin, wxComboBox); + + pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXUINT)SHORT1FROMMP(wParam) + ); + } + return 0; + } + break; + case SPBN_UPARROW: case SPBN_DOWNARROW: case SPBN_CHANGE: @@ -2936,7 +2937,7 @@ MRESULT wxWindowOS2::OS2WindowProc( if ( bProcessed ) { // we never set focus from here - mResult = FALSE; + mResult = (MRESULT)FALSE; } break; @@ -2967,6 +2968,20 @@ MRESULT wxWindowOS2::OS2WindowProc( mResult = (MRESULT)TRUE; } break; + +#if wxUSE_MENUS_NATIVE + case WM_MENUEND: + if (wxCurrentPopupMenu) + { + if (GetHmenuOf(wxCurrentPopupMenu) == (HWND)lParam) + { + // Break out of msg loop in DoPopupMenu + ::WinPostMsg((HWND)lParam,WM_COMMAND,wParam,0); + } + } + break; +#endif // wxUSE_MENUS_NATIVE + } if (!bProcessed) { @@ -2984,45 +2999,17 @@ MRESULT wxWindowOS2::OS2WindowProc( return mResult; } // end of wxWindowOS2::OS2WindowProc -#ifndef __EMX__ -// clashes with wxDlgProc in toplevel.cpp? -// -// Dialog window proc -// -MRESULT wxDlgProc( - HWND WXUNUSED(hWnd) -, UINT uMsg -, MPARAM WXUNUSED(wParam) -, MPARAM WXUNUSED(lParam)) -{ - if (uMsg == WM_INITDLG) - { - // - // For this message, returning TRUE tells system to set focus to the - // first control in the dialog box - // - return (MRESULT)TRUE; - } - else - { - // - // For all the other ones, FALSE means that we didn't process the - // message - // - return (MRESULT)0; - } -} // end of wxDlgProc -#endif +// ---------------------------------------------------------------------------- +// wxWindow <-> HWND map +// ---------------------------------------------------------------------------- + +wxWinHashTable *wxWinHandleHash = NULL; wxWindow* wxFindWinFromHandle( WXHWND hWnd ) { - wxNode* pNode = wxWinHandleList->Find((long)hWnd); - - if (!pNode) - return NULL; - return (wxWindow *)pNode->Data(); + return (wxWindow *)wxWinHandleHash->Get((long)hWnd); } // end of wxFindWinFromHandle void wxAssociateWinWithHandle( @@ -3050,9 +3037,9 @@ void wxAssociateWinWithHandle( } else if (!pOldWin) { - wxWinHandleList->Append( (long)hWnd - ,pWin - ); + wxWinHandleHash->Put( (long)hWnd + ,(wxWindow *)pWin + ); } } // end of wxAssociateWinWithHandle @@ -3060,7 +3047,7 @@ void wxRemoveHandleAssociation( wxWindowOS2* pWin ) { - wxWinHandleList->DeleteObject(pWin); + wxWinHandleHash->Delete((long)pWin->GetHWND()); } // end of wxRemoveHandleAssociation // @@ -3129,9 +3116,6 @@ bool wxWindowOS2::OS2Create( int nY = 0L; int nWidth = 0L; int nHeight = 0L; - wxWindow* pParent = GetParent(); - HWND hWnd = NULLHANDLE; - HWND hParent; long lControlId = 0L; wxWindowCreationHook vHook(this); wxString sClassName((wxChar*)zClass); @@ -3157,7 +3141,7 @@ bool wxWindowOS2::OS2Create( // which is the same but without CS_[HV]REDRAW class styles so using it // ensures that the window is not fully repainted on each resize // - if (GetWindowStyleFlag() & wxNO_FULL_REPAINT_ON_RESIZE) + if (!HasFlag(wxFULL_REPAINT_ON_RESIZE)) { sClassName += wxT("NR"); } @@ -3196,7 +3180,7 @@ bool wxWindowOS2::OS2Create( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error creating frame. Error: %s\n", sError); + wxLogError("Error creating frame. Error: %s\n", sError.c_str()); return FALSE; } SetSize( nX @@ -3230,7 +3214,7 @@ bool wxWindowOS2::HandleCreate( bool wxWindowOS2::HandleDestroy() { wxWindowDestroyEvent vEvent((wxWindow*)this); - + vEvent.SetId(GetId()); (void)GetEventHandler()->ProcessEvent(vEvent); // @@ -3239,7 +3223,6 @@ bool wxWindowOS2::HandleDestroy() #if wxUSE_DRAG_AND_DROP if (m_dropTarget != NULL) { - m_dropTarget->Revoke(m_hWnd); delete m_dropTarget; m_dropTarget = NULL; } @@ -3311,7 +3294,7 @@ bool wxWindowOS2::HandleSetFocus( } // end of wxWindowOS2::HandleSetFocus bool wxWindowOS2::HandleKillFocus( - WXHWND WXUNUSED(hWnd) + WXHWND hWnd ) { #if wxUSE_CARET @@ -3324,11 +3307,38 @@ bool wxWindowOS2::HandleKillFocus( } #endif // wxUSE_CARET +#if wxUSE_TEXTCTRL + // + // If it's a wxTextCtrl don't send the event as it will be done + // after the control gets to process it. + // + wxTextCtrl* pCtrl = wxDynamicCastThis(wxTextCtrl); + + if (pCtrl) + { + return FALSE; + } +#endif + + // + // Don't send the event when in the process of being deleted. This can + // only cause problems if the event handler tries to access the object. + // + if ( m_isBeingDeleted ) + { + return FALSE; + } + wxFocusEvent vEvent( wxEVT_KILL_FOCUS ,m_windowId ); vEvent.SetEventObject(this); + + // + // wxFindWinFromHandle() may return NULL, it is ok + // + vEvent.SetWindow(wxFindWinFromHandle(hWnd)); return GetEventHandler()->ProcessEvent(vEvent); } // end of wxWindowOS2::HandleKillFocus @@ -3343,7 +3353,7 @@ bool wxWindowOS2::HandleShow( { wxShowEvent vEvent(GetId(), bShow); - vEvent.m_eventObject = this; + vEvent.SetEventObject(this); return GetEventHandler()->ProcessEvent(vEvent); } // end of wxWindowOS2::HandleShow @@ -3353,7 +3363,7 @@ bool wxWindowOS2::HandleInitDialog( { wxInitDialogEvent vEvent(GetId()); - vEvent.m_eventObject = this; + vEvent.SetEventObject(this); return GetEventHandler()->ProcessEvent(vEvent); } // end of wxWindowOS2::HandleInitDialog @@ -3409,7 +3419,7 @@ bool wxWindowOS2::OS2OnDrawItem( ); vDc.SetHPS(pMeasureStruct->hps); // - // Load the wxWindows Pallete and set to RGB mode + // Load the wxWidgets Pallete and set to RGB mode // if (!::GpiCreateLogColorTable( pMeasureStruct->hps ,0L @@ -3421,7 +3431,7 @@ bool wxWindowOS2::OS2OnDrawItem( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Unable to set current color table. Error: %s\n", sError); + wxLogError("Unable to set current color table. Error: %s\n", sError.c_str()); } // // Set the color table to RGB mode @@ -3436,7 +3446,7 @@ bool wxWindowOS2::OS2OnDrawItem( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Unable to set current color table. Error: %s\n", sError); + wxLogError("Unable to set current color table. Error: %s\n", sError.c_str()); } wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE ); @@ -3537,7 +3547,7 @@ bool wxWindowOS2::OS2OnDrawItem( return FALSE; } // end of wxWindowOS2::OS2OnDrawItem -bool wxWindowOS2::OS2OnMeasureItem( +long wxWindowOS2::OS2OnMeasureItem( int lId , WXMEASUREITEMSTRUCT* pItemStruct ) @@ -3563,20 +3573,26 @@ bool wxWindowOS2::OS2OnMeasureItem( ,&nHeight )) { + MRESULT mRc; + pMeasureStruct->rclItem.xRight = nWidth; pMeasureStruct->rclItem.xLeft = 0L; pMeasureStruct->rclItem.yTop = nHeight; pMeasureStruct->rclItem.yBottom = 0L; - return TRUE; + mRc = MRFROM2SHORT(nHeight, nWidth); + return LONGFROMMR(mRc); } - return FALSE; + return 0L; } } wxWindow* pItem = FindItem(lId); if (pItem && pItem->IsKindOf(CLASSINFO(wxControl))) { - return ((wxControl *)pItem)->OS2OnMeasure(pItemStruct); + OWNERITEM vItem; + + vItem.idItem = (LONG)pItemStruct; + return ((wxControl *)pItem)->OS2OnMeasure((WXMEASUREITEMSTRUCT*)&vItem); } #else lId = lId; @@ -3639,23 +3655,23 @@ void wxWindowOS2::OnSysColourChanged( wxSysColourChangedEvent& rEvent ) { - wxNode* pNode = GetChildren().First(); + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while (pNode) + while (node) { // // Only propagate to non-top-level windows // - wxWindow* pWin = (wxWindow *)pNode->Data(); + wxWindow* pWin = (wxWindow *)node->GetData(); if (pWin->GetParent()) { wxSysColourChangedEvent vEvent; - rEvent.m_eventObject = pWin; + rEvent.SetEventObject(pWin); pWin->GetEventHandler()->ProcessEvent(vEvent); } - pNode = pNode->Next(); + node = node->GetNext(); } } // end of wxWindowOS2::OnSysColourChanged @@ -3663,12 +3679,26 @@ void wxWindowOS2::OnSysColourChanged( // painting // --------------------------------------------------------------------------- +void wxWindow::OnPaint ( + wxPaintEvent& rEvent +) +{ + HDC hDC = (HDC)wxPaintDC::FindDCInCache((wxWindow*) rEvent.GetEventObject()); + + if (hDC != 0) + { + OS2DefWindowProc( (WXUINT)WM_PAINT + ,(WXWPARAM)hDC + ,(WXLPARAM)0 + ); + } +} // end of wxWindow::OnPaint + bool wxWindowOS2::HandlePaint() { HRGN hRgn; wxPaintEvent vEvent(m_windowId); HPS hPS; - RECTL vRect; bool bProcessed; // Create empty region @@ -3682,6 +3712,51 @@ bool wxWindowOS2::HandlePaint() return FALSE; } + // Get all the rectangles from the region, convert the individual + // rectangles to "the other" coordinate system and reassemble a + // region from the rectangles, to be feed into m_updateRegion. + // + // FIXME: This is a bad hack since OS/2 API specifies that rectangles + // passed into GpiSetRegion must not have Bottom > Top, + // however, at first sight, it _seems_ to work nonetheless. + // + RGNRECT vRgnData; + PRECTL pUpdateRects = NULL; + vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT; + if (::GpiQueryRegionRects( hPS // Pres space + ,hRgn // Handle of region to query + ,NULL // Return all RECTs + ,&vRgnData // Will contain number or RECTs in region + ,NULL // NULL to return number of RECTs + )) + { + pUpdateRects = new RECTL[vRgnData.crcReturned]; + vRgnData.crc = vRgnData.crcReturned; + vRgnData.ircStart = 1; + if (::GpiQueryRegionRects( hPS // Pres space of source + ,hRgn // Handle of source region + ,NULL // Return all RECTs + ,&vRgnData // Operations set to return rects + ,pUpdateRects // Will contain the actual RECTS + )) + { + int height; + RECT vRect; + ::WinQueryWindowRect(GetHwnd(), &vRect); + height = vRect.yTop; + + for(size_t i = 0; i < vRgnData.crc; i++) + { + int rectHeight; + rectHeight = pUpdateRects[i].yTop - pUpdateRects[i].yBottom; + pUpdateRects[i].yTop = height - pUpdateRects[i].yTop; + pUpdateRects[i].yBottom = pUpdateRects[i].yTop + rectHeight; + } + ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects); + delete [] pUpdateRects; + } + } + m_updateRegion = wxRegion(hRgn, hPS); vEvent.SetEventObject(this); @@ -3694,12 +3769,12 @@ bool wxWindowOS2::HandlePaint() { // // OS/2 needs to process this right here, not by the default proc - // Window's default proc correctly paints everything, OS/2 does not! + // Window's default proc correctly paints everything, OS/2 does not. + // For decorative panels that typically have no children, we draw + // borders. // HPS hPS; RECTL vRect; - wxFrame* pFrame; - wxWindow* pParent; hPS = ::WinBeginPaint( GetHwnd() ,NULLHANDLE @@ -3721,11 +3796,11 @@ bool wxWindowOS2::HandlePaint() ,0L ,NULL ); - - ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); + if (::WinIsWindowVisible(GetHWND())) + ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); if (m_dwExStyle) { - LINEBUNDLE vLineBundle; + LINEBUNDLE vLineBundle; vLineBundle.lColor = 0x00000000; // Black vLineBundle.usMixMode = FM_OVERPAINT; @@ -3746,11 +3821,47 @@ bool wxWindowOS2::HandlePaint() ,m_dwExStyle ); } - ::WinEndPaint(hPS); } + ::WinEndPaint(hPS); bProcessed = TRUE; } + else if (!bProcessed && + IsKindOf(CLASSINFO(wxPanel)) + ) + { + // + // Panel with children, usually fills a frame client so no borders. + // + HPS hPS; + RECTL vRect; + hPS = ::WinBeginPaint( GetHwnd() + ,NULLHANDLE + ,&vRect + ); + if(hPS) + { + ::GpiCreateLogColorTable( hPS + ,0L + ,LCOLF_CONSECRGB + ,0L + ,(LONG)wxTheColourDatabase->m_nSize + ,(PLONG)wxTheColourDatabase->m_palTable + ); + ::GpiCreateLogColorTable( hPS + ,0L + ,LCOLF_RGB + ,0L + ,0L + ,NULL + ); + + if (::WinIsWindowVisible(GetHWND())) + ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); + } + ::WinEndPaint(hPS); + bProcessed = TRUE; + } return bProcessed; } // end of wxWindowOS2::HandlePaint @@ -3842,7 +3953,6 @@ bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp ) { - bool bRc = FALSE; POINTL vPoint; switch(pSwp->fl) @@ -3927,15 +4037,22 @@ void wxWindowOS2::InitMouseEvent( , WXUINT uFlags ) { + int nHeight; + DoGetSize(0, &nHeight); rEvent.m_x = nX; - rEvent.m_y = nY; - rEvent.m_shiftDown = ((uFlags & VK_SHIFT) != 0); - rEvent.m_controlDown = ((uFlags & VK_CTRL) != 0); - rEvent.m_leftDown = ((uFlags & VK_BUTTON1) != 0); - rEvent.m_middleDown = ((uFlags & VK_BUTTON3) != 0); - rEvent.m_rightDown = ((uFlags & VK_BUTTON2) != 0); + // Convert to wxWidgets standard coordinate system! + rEvent.m_y = nHeight - nY; + rEvent.m_shiftDown = ((uFlags & KC_SHIFT) != 0); + rEvent.m_controlDown = ((uFlags & KC_CTRL) != 0); + rEvent.m_altDown = ((uFlags & KC_ALT) != 0); + rEvent.m_leftDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) & + 0x8000) != 0; + rEvent.m_middleDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) & + 0x8000) != 0; + rEvent.m_rightDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) & + 0x8000) != 0; rEvent.SetTimestamp(s_currentMsg.time); - rEvent.m_eventObject = this; + rEvent.SetEventObject(this); rEvent.SetId(GetId()); #if wxUSE_MOUSEEVENT_HACK @@ -3956,7 +4073,7 @@ bool wxWindowOS2::HandleMouseEvent( // // The mouse events take consecutive IDs from WM_MOUSEFIRST to - // WM_MOUSELAST, so it's enough to substract WM_MOUSEMOVE == WM_MOUSEFIRST + // WM_MOUSELAST, so it's enough to subtract WM_MOUSEMOVE == WM_MOUSEFIRST // from the message id and take the value in the table to get wxWin event // id // @@ -3974,27 +4091,30 @@ bool wxWindowOS2::HandleMouseEvent( wxEVT_MIDDLE_DCLICK }; - wxMouseEvent vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]); - - InitMouseEvent( vEvent - ,nX - ,nY - ,uFlags - ); - - bProcessed = GetEventHandler()->ProcessEvent(vEvent); - if (!bProcessed) + // Bounds check + if ((uMsg >= WM_MOUSEMOVE) && (uMsg <= WM_BUTTON3DBLCLK)) { - HPOINTER hPtr = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_WAIT, FALSE); - HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR(); + wxMouseEvent vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]); - if (hCursor != NULLHANDLE) + InitMouseEvent( vEvent + ,nX + ,nY + ,uFlags + ); + + bProcessed = GetEventHandler()->ProcessEvent(vEvent); + if (!bProcessed) { - ::WinSetPointer(HWND_DESKTOP, hCursor); - bProcessed = TRUE; + HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR(); + + if (hCursor != NULLHANDLE) + { + ::WinSetPointer(HWND_DESKTOP, hCursor); + bProcessed = TRUE; + } } } - return GetEventHandler()->ProcessEvent(vEvent); + return bProcessed; } // end of wxWindowOS2::HandleMouseEvent bool wxWindowOS2::HandleMouseMove( @@ -4049,7 +4169,7 @@ wxKeyEvent wxWindowOS2::CreateKeyEvent( vEvent.m_controlDown = IsCtrlDown(); vEvent.m_altDown = (HIWORD(lParam) & KC_ALT) == KC_ALT; - vEvent.m_eventObject = (wxWindow *)this; // const_cast + vEvent.SetEventObject((wxWindow *)this); // const_cast vEvent.m_keyCode = nId; vEvent.m_rawCode = (wxUint32)wParam; vEvent.m_rawFlags = (wxUint32)lParam; @@ -4101,9 +4221,11 @@ bool wxWindowOS2::HandleChar( if (isASCII) { // - // If 1 -> 26, translate to CTRL plus a letter. + // If 1 -> 26, translate to either special keycode or just set + // ctrlDown. IOW, Ctrl-C should result in keycode == 3 and + // ControlDown() == TRUE. // - vId = (int)wParam; + vId = SHORT1FROMMP(lParam); if ((vId > 0) && (vId < 27)) { switch (vId) @@ -4122,13 +4244,13 @@ bool wxWindowOS2::HandleChar( default: bCtrlDown = TRUE; - vId = vId + 'a' - 1; + break; } } } else // we're called from WM_KEYDOWN { - vId = wxCharCodeOS2ToWX((int)wParam); + vId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); if (vId == 0) return FALSE; } @@ -4150,14 +4272,14 @@ bool wxWindowOS2::HandleKeyDown( , WXLPARAM lParam ) { - int nId = wxCharCodeOS2ToWX((int)wParam); + int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); if (!nId) { // // Normal ASCII char // - nId = (int)wParam; + nId = SHORT1FROMMP(lParam); } if (nId != -1) @@ -4181,7 +4303,7 @@ bool wxWindowOS2::HandleKeyUp( , WXLPARAM lParam ) { - int nId = wxCharCodeOS2ToWX((int)wParam); + int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); if (!nId) { @@ -4236,32 +4358,32 @@ bool wxWindowOS2::OS2OnScroll( vEvent.SetPosition(wPos); vEvent.SetOrientation(nOrientation); - vEvent.m_eventObject = this; + vEvent.SetEventObject(this); switch (wParam) { case SB_LINEUP: - vEvent.m_eventType = wxEVT_SCROLLWIN_LINEUP; + vEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP); break; case SB_LINEDOWN: - vEvent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; + vEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN); break; case SB_PAGEUP: - vEvent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; + vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP); break; case SB_PAGEDOWN: - vEvent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN; + vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN); break; case SB_SLIDERPOSITION: - vEvent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE; + vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBRELEASE); break; case SB_SLIDERTRACK: - vEvent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; + vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBTRACK); break; default: @@ -4274,62 +4396,72 @@ void wxWindowOS2::MoveChildren( int nDiff ) { - SWP vSwp; - - for (wxWindowList::Node* pNode = GetChildren().GetFirst(); - pNode; - pNode = pNode->GetNext()) + // + // We want to handle top levels ourself, manually + // + if (!IsTopLevel() && GetAutoLayout()) + { + Layout(); + } + else { - wxWindow* pWin = pNode->GetData(); + SWP vSwp; - ::WinQueryWindowPos( GetHwndOf(pWin) - ,&vSwp - ); - if (pWin->IsKindOf(CLASSINFO(wxControl))) + for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + node; + node = node->GetNext()) { - wxControl* pCtrl; + wxWindow* pWin = node->GetData(); - // - // Must deal with controls that have margins like ENTRYFIELD. The SWP - // struct of such a control will have and origin offset from its intended - // position by the width of the margins. - // - pCtrl = wxDynamicCast(pWin, wxControl); - vSwp.y -= pCtrl->GetYComp(); - vSwp.x -= pCtrl->GetXComp(); - } - ::WinSetWindowPos( GetHwndOf(pWin) - ,HWND_TOP - ,vSwp.x - ,vSwp.y - nDiff - ,vSwp.cx - ,vSwp.cy - ,SWP_MOVE | SWP_SHOW | SWP_ZORDER - ); - ::WinQueryWindowPos(GetHwndOf(pWin), pWin->GetSwp()); - if (pWin->IsKindOf(CLASSINFO(wxRadioBox))) - { - wxRadioBox* pRadioBox; - - pRadioBox = wxDynamicCast(pWin, wxRadioBox); - pRadioBox->AdjustButtons( (int)vSwp.x - ,(int)vSwp.y - nDiff - ,(int)vSwp.cx - ,(int)vSwp.cy - ,pRadioBox->GetSizeFlags() - ); - } - if (pWin->IsKindOf(CLASSINFO(wxSlider))) - { - wxSlider* pSlider; - - pSlider = wxDynamicCast(pWin, wxSlider); - pSlider->AdjustSubControls( (int)vSwp.x - ,(int)vSwp.y - nDiff - ,(int)vSwp.cx - ,(int)vSwp.cy - ,(int)pSlider->GetSizeFlags() - ); + ::WinQueryWindowPos( GetHwndOf(pWin) + ,&vSwp + ); + if (pWin->IsKindOf(CLASSINFO(wxControl))) + { + wxControl* pCtrl; + + // + // Must deal with controls that have margins like ENTRYFIELD. The SWP + // struct of such a control will have and origin offset from its intended + // position by the width of the margins. + // + pCtrl = wxDynamicCast(pWin, wxControl); + vSwp.y -= pCtrl->GetYComp(); + vSwp.x -= pCtrl->GetXComp(); + } + ::WinSetWindowPos( GetHwndOf(pWin) + ,HWND_TOP + ,vSwp.x + ,vSwp.y - nDiff + ,vSwp.cx + ,vSwp.cy + ,SWP_MOVE + ); + ::WinQueryWindowPos(GetHwndOf(pWin), pWin->GetSwp()); + if (pWin->IsKindOf(CLASSINFO(wxRadioBox))) + { + wxRadioBox* pRadioBox; + + pRadioBox = wxDynamicCast(pWin, wxRadioBox); + pRadioBox->AdjustButtons( (int)vSwp.x + ,(int)vSwp.y - nDiff + ,(int)vSwp.cx + ,(int)vSwp.cy + ,pRadioBox->GetSizeFlags() + ); + } + if (pWin->IsKindOf(CLASSINFO(wxSlider))) + { + wxSlider* pSlider; + + pSlider = wxDynamicCast(pWin, wxSlider); + pSlider->AdjustSubControls( (int)vSwp.x + ,(int)vSwp.y - nDiff + ,(int)vSwp.cx + ,(int)vSwp.cy + ,(int)pSlider->GetSizeFlags() + ); + } } } Refresh(); @@ -4338,7 +4470,7 @@ void wxWindowOS2::MoveChildren( // // Getting the Y position for a window, like a control, is a real // pain. There are three sitatuions we must deal with in determining -// the OS2 to wxWindows Y coordinate. +// the OS2 to wxWidgets Y coordinate. // // 1) The controls are created in a dialog. // This is the easiest since a dialog is created with its original @@ -4370,8 +4502,6 @@ int wxWindowOS2::GetOS2ParentHeight( wxWindowOS2* pParent ) { - wxWindowOS2* pGrandParent = NULL; - // // Case 1 // @@ -4852,7 +4982,7 @@ const char* wxGetMessageName( // Beginning of user defined messages case 0x1000: return "WM_USER"; - // wxWindows user defined types + // wxWidgets user defined types // listview // case 0x1000 + 0: return "LVM_GETBKCOLOR"; @@ -5167,7 +5297,6 @@ wxWindowOS2* FindWindowForMouseEvent( POINTL vPoint; BOOL rcEnabled = FALSE; BOOL rcVisible = FALSE; - HWND hWndDesktop = HWND_DESKTOP; ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); hWndUnderMouse = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE); @@ -5177,8 +5306,7 @@ wxWindowOS2* FindWindowForMouseEvent( if (pWinUnderMouse) { - wxWindowList::Node* pCurrent = pWinUnderMouse->GetChildren().GetFirst(); - wxWindow* pChild = NULL; + wxWindowList::compatibility_iterator current = pWinUnderMouse->GetChildren().GetFirst(); wxWindow* pGrandChild = NULL; RECTL vRect; POINTL vPoint2; @@ -5187,9 +5315,9 @@ wxWindowOS2* FindWindowForMouseEvent( // // Find a child window mouse might be under // - while (pCurrent) + while (current) { - wxWindow* pChild = pCurrent->GetData(); + wxWindow* pChild = current->GetData(); vPoint2.x = vPoint.x; vPoint2.y = vPoint.y; @@ -5200,11 +5328,11 @@ wxWindowOS2* FindWindowForMouseEvent( if (pChild->IsTopLevel()) { POINTL vPoint3; - wxWindowList::Node* pCurrent2 =pChild->GetChildren().GetFirst(); + wxWindowList::compatibility_iterator current2 =pChild->GetChildren().GetFirst(); - while (pCurrent2) + while (current2) { - wxWindow* pGrandChild = pCurrent2->GetData(); + wxWindow* pGrandChild = current2->GetData(); vPoint3.x = vPoint2.x; vPoint3.y = vPoint2.y; @@ -5220,7 +5348,7 @@ wxWindowOS2* FindWindowForMouseEvent( pWinUnderMouse = pGrandChild; break; } - pCurrent2 = pCurrent2->GetNext(); + current2 = current2->GetNext(); } if (pGrandChild) break; @@ -5232,7 +5360,7 @@ wxWindowOS2* FindWindowForMouseEvent( if (rcVisible && rcEnabled) break; } - pCurrent = pCurrent->GetNext(); + current = current->GetNext(); } } }