X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05fc6c0a67822034f23a6e6c3fb9e75989fcc5a3..984ef9dce7bcc69881176a89c5fe8a80511ea58c:/src/os2/window.cpp diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 81250fb80f..a821b547ba 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -702,48 +702,48 @@ void wxWindow::ScrollWindow( // subclassing // --------------------------------------------------------------------------- -void wxWindow::SubclassWin(WXHWND hWnd) +void wxWindow::SubclassWin( + WXHWND hWnd +) { HAB hab; HWND hwnd = (HWND)hWnd; wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") ); -/* -* TODO: implement something like this: -* wxCHECK_RET(::WinIsWindow(hab, hwnd), wxT("invalid HWND in SubclassWin") ); -* -* wxAssociateWinWithHandle(hwnd, this); -* -* m_fnOldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC); -* SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc); -*/ -} + wxCHECK_RET(::WinIsWindow(hab, hwnd), wxT("invalid HWND in SubclassWin") ); + + wxAssociateWinWithHandle(hwnd, this); + + m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc); + ::WinSetWindowULong(hwnd, QWS_USER, (ULONG)wxWndProc); +} // end of wxWindow::SubclassWin void wxWindow::UnsubclassWin() { -/* -* TODO: + HAB hab; wxRemoveHandleAssociation(this); + // // Restore old Window proc - HWND hwnd = GetHwnd(); - if ( hwnd ) + // + HWND hwnd = GetHwnd(); + + if (hwnd) { m_hWnd = 0; - wxCHECK_RET( ::IsWindow(hwnd), wxT("invalid HWND in UnsubclassWin") ); + wxCHECK_RET( ::WinIsWindow(hab, hwnd), wxT("invalid HWND in UnsubclassWin") ); - FARPROC farProc = (FARPROC) GetWindowLong(hwnd, GWL_WNDPROC); - if ( (m_oldWndProc != 0) && (farProc != (FARPROC) m_oldWndProc) ) + PFNWP fnProc = (PFNWP)::WinQueryWindowULong(hwnd, QWS_USER); + if ( (m_fnOldWndProc != 0) && (fnProc != (PFNWP) m_fnOldWndProc)) { - SetWindowLong(hwnd, GWL_WNDPROC, (LONG) m_oldWndProc); - m_oldWndProc = 0; + WinSubclassWindow(hwnd, (PFNWP)m_fnOldWndProc); + m_fnOldWndProc = 0; } } -*/ -} +} // end of wxWindow::UnsubclassWin // // Make a Windows extended style from the given wxWindows window style @@ -760,135 +760,201 @@ WXDWORD wxWindow::MakeExtendedStyle( return exStyle; } // end of wxWindow::MakeExtendedStyle +// // Determines whether native 3D effects or CTL3D should be used, // applying a default border style if required, and returning an extended // style to pass to CreateWindowEx. -WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, - bool *want3D) const +// +WXDWORD wxWindow::Determine3DEffects( + WXDWORD dwDefaultBorderStyle +, bool* pbWant3D +) const { - DWORD exStyle = 0L; // remove after implementation doe -/* TODO: this ought to be fun -* - // 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) ) - { - *want3D = FALSE; - return MakeExtendedStyle(m_windowStyle, FALSE); - } - - // Determine whether we should be using 3D effects or not. - bool nativeBorder = FALSE; // by default, we don't want a Win95 effect - - // 1) App can specify global 3D effects - *want3D = wxTheApp->GetAuto3D(); - - // 2) If the parent is being drawn with user colours, or simple border specified, - // switch effects off. TODO: replace wxUSER_COLOURS with wxNO_3D - if ( GetParent() && (GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) || (m_windowStyle & wxSIMPLE_BORDER) ) - *want3D = FALSE; - - // 3) Control can override this global setting by defining - // a border style, e.g. wxSUNKEN_BORDER - if ( m_windowStyle & wxSUNKEN_BORDER ) - *want3D = TRUE; + WXDWORD dwStyle = 0L; - // 4) If it's a special border, CTL3D can't cope so we want a native border - if ( (m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSTATIC_BORDER) ) - { - *want3D = TRUE; - nativeBorder = TRUE; - } - - // 5) If this isn't a Win95 app, and we are using CTL3D, remove border - // effects from extended style -#if wxUSE_CTL3D - if ( *want3D ) - nativeBorder = FALSE; -#endif - - DWORD exStyle = MakeExtendedStyle(m_windowStyle, !nativeBorder); - - // If we want 3D, but haven't specified a border here, - // apply the default border style specified. - // TODO what about non-Win95 WIN32? Does it have borders? -#if defined(__WIN95__) && !wxUSE_CTL3D - if ( defaultBorderStyle && (*want3D) && ! ((m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) || - (m_windowStyle & wxSTATIC_BORDER) || (m_windowStyle & wxSIMPLE_BORDER) )) - exStyle |= defaultBorderStyle; // WS_EX_CLIENTEDGE; -#endif -*/ - return exStyle; -} + // + // Native PM does not have any specialize 3D effects like WIN32 does + // + *pbWant3D = FALSE; + return dwStyle; +} // end of wxWindow::Determine3DEffects #if WXWIN_COMPATIBILITY -void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event) +void wxWindow::OnCommand( + wxWindow& rWin +, wxCommandEvent& rEvent +) { - // TODO: -} + if (GetEventHandler()->ProcessEvent(rEvent)) + return; + if (m_parent) + m_parent->GetEventHandler()->OnCommand( rWin + ,rEvent + ); +} // end of wxWindow::OnCommand -wxObject* wxWindow::GetChild(int number) const +wxObject* wxWindow::GetChild( + int nNumber +) const { - // TODO: - return((wxObject*)this); -} + // + // Return a pointer to the Nth object in the Panel + // + wxNode* pNode = GetChildren().First(); + int n = nNumber; -void wxWindow::OnDefaultAction(wxControl *initiatingItem) -{ - // TODO: -} + while (pNode && n--) + pNode = pNode->Next(); + if (pNode) + { + wxObject* pObj = (wxObject*)pNode->Data(); + return(pObj); + } + else + return NULL; +} // end of wxWindow::GetChild #endif // WXWIN_COMPATIBILITY +// // Setup background and foreground colours correctly +// void wxWindow::SetupColours() { if ( GetParent() ) SetBackgroundColour(GetParent()->GetBackgroundColour()); -} +} // end of wxWindow::SetupColours -void wxWindow::OnIdle(wxIdleEvent& event) +void wxWindow::OnIdle( + wxIdleEvent& rEvent +) { - // TODO: -} + // + // Check if we need to send a LEAVE event + // + if (m_bMouseInWindow) + { + POINTL vPoint; + ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); + if (::WinWindowFromPoint(HWND_DESKTOP, &vPoint, FALSE) != (HWND)GetHwnd()) + { + // + // Generate a LEAVE event + // + m_bMouseInWindow = FALSE; + + // + // Unfortunately the mouse button and keyboard state may have changed + // by the time the OnIdle function is called, so 'state' may be + // meaningless. + // + int nState = 0; + + if (::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) != 0) + nState |= VK_SHIFT; + if (::WinGetKeyState(HWND_DESKTOP, VK_CTRL) != 0); + nState |= VK_CTRL; + + wxMouseEvent rEvent(wxEVT_LEAVE_WINDOW); + + InitMouseEvent( rEvent + ,vPoint.x + ,vPoint.y + ,nState + ); + (void)GetEventHandler()->ProcessEvent(rEvent); + } + } + UpdateWindowUI(); +} // end of wxWindow::OnIdle + +// // Set this window to be the child of 'parent'. -bool wxWindow::Reparent(wxWindow *parent) +// +bool wxWindow::Reparent( + wxWindow* pParent +) { - if ( !wxWindowBase::Reparent(parent) ) + if (!wxWindowBase::Reparent(pParent)) return FALSE; - // TODO: - return FALSE; -} + + HWND hWndChild = GetHwnd(); + HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0; + + ::WinSetParent(hWndChild, hWndParent, TRUE); + return TRUE; +} // end of wxWindow::Reparent void wxWindow::Clear() { - // TODO: -} + wxClientDC vDc(this); + wxBrush vBrush( GetBackgroundColour() + ,wxSOLID + ); + + vDc.SetBackground(vBrush); + vDc.Clear(); +} // end of wxWindow::Clear -void wxWindow::Refresh(bool eraseBack, const wxRect *rect) +void wxWindow::Refresh( + bool bEraseBack +, const wxRect* pRect +) { - // TODO: -} + HWND hWnd = GetHwnd(); + + if (hWnd) + { + if (pRect) + { + RECTL vOs2Rect; + + vOs2Rect.xLeft = pRect->x; + vOs2Rect.yTop = pRect->y; + vOs2Rect.xRight = pRect->x + pRect->width; + vOs2Rect.yBottom = pRect->y + pRect->height; + + ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack); + } + else + ::WinInvalidateRect(hWnd, NULL, bEraseBack); + } +} // end of wxWindow::Refresh // --------------------------------------------------------------------------- // drag and drop // --------------------------------------------------------------------------- #if wxUSE_DRAG_AND_DROP -void wxWindow::SetDropTarget(wxDropTarget *pDropTarget) +void wxWindow::SetDropTarget( + wxDropTarget* pDropTarget +) { - // TODO: -} + 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 wxWindow::SetDropTarget #endif +// // old style file-manager drag&drop support: we retain the old-style // DragAcceptFiles in parallel with SetDropTarget. -void wxWindow::DragAcceptFiles(bool accept) +// +void wxWindow::DragAcceptFiles( + bool bAccept +) { - // TODO: -} + HWND hWnd = GetHwnd(); + + if (hWnd && bAccept) + ::DrgAcceptDroppedFiles(hWnd, NULL, NULL, DO_COPY, 0L); +} // end of wxWindow::DragAcceptFiles // ---------------------------------------------------------------------------- // tooltips @@ -896,13 +962,15 @@ void wxWindow::DragAcceptFiles(bool accept) #if wxUSE_TOOLTIPS -void wxWindow::DoSetToolTip(wxToolTip *tooltip) +void wxWindow::DoSetToolTip( + wxToolTip* pTooltip +) { - wxWindowBase::DoSetToolTip(tooltip); + wxWindowBase::DoSetToolTip(pTooltip); - if ( m_tooltip ) + if (m_tooltip) m_tooltip->SetWindow(this); -} +} // end of wxWindow::DoSetToolTip #endif // wxUSE_TOOLTIPS @@ -911,38 +979,154 @@ void wxWindow::DoSetToolTip(wxToolTip *tooltip) // --------------------------------------------------------------------------- // Get total size -void wxWindow::DoGetSize( int *width, int *height ) const +void wxWindow::DoGetSize( + int* pWidth +, int* pHeight +) const { - // TODO: -} + HWND hWnd = GetHwnd(); + RECTL vRect; -void wxWindow::DoGetPosition( int *x, int *y ) const + ::WinQueryWindowRect(hWnd, &vRect); + + if (pWidth) + *pWidth = vRect.xRight - vRect.xLeft; + if (pHeight ) + // OS/2 PM is backwards from windows + *pHeight = vRect.yTop - vRect.yBottom; +} // end of wxWindow::DoGetSize + +void wxWindow::DoGetPosition( + int* pX +, int* pY +) const { - // TODO: -} + HWND hWnd = GetHwnd(); + RECT vRect; + POINTL vPoint; + + ::WinQueryWindowRect(hWnd, &vRect); + + vPoint.x = vRect.xLeft; + vPoint.y = vRect.yBottom; + + // + // We do the adjustments with respect to the parent only for the "real" + // children, not for the dialogs/frames + // + if (!IsTopLevel()) + { + HWND hParentWnd = 0; + wxWindow* pParent = GetParent(); + + if (pParent) + hParentWnd = GetWinHwnd(pParent); + + // + // Since we now have the absolute screen coords, if there's a parent we + // must subtract its bottom left corner + // + if (hParentWnd) + { + RECTL vRect2; + + ::WinQueryWindowRect(hParentWnd, &vRect2); + vPoint.x -= vRect.xLeft; + vPoint.y -= vRect.yBottom; + } + + // + // We may be faking the client origin. So a window that's really at (0, + // 30) may appear (to wxWin apps) to be at (0, 0). + // + wxPoint vPt(pParent->GetClientAreaOrigin()); + + vPoint.x -= vPt.x; + vPoint.y -= vPt.y; + } + + if (pX) + *pX = vPoint.x; + if (pY) + *pY = vPoint.y; +} // end of wxWindow::DoGetPosition -void wxWindow::DoScreenToClient( int *x, int *y ) const +void wxWindow::DoScreenToClient( + int* pX +, int* pY +) const { - // TODO: -} + HWND hWnd = GetHwnd(); + SWP vSwp; + + ::WinQueryWindowPos(hWnd, &vSwp); -void wxWindow::DoClientToScreen( int *x, int *y ) const + if (pX) + *pX -= vSwp.x; + if (pY) + *pY -= vSwp.y; +} // end of wxWindow::DoScreenToClient + +void wxWindow::DoClientToScreen( + int* pX +, int* pY +) const { - // TODO: -} + HWND hWnd = GetHwnd(); + SWP vSwp; + + ::WinQueryWindowPos(hWnd, &vSwp); + + if (pX) + *pX += vSwp.x; + if (pY) + *pY += vSwp.y; +} // end of wxWindow::DoClientToScreen +// // Get size *available for subwindows* i.e. excluding menu bar etc. -void wxWindow::DoGetClientSize( int *width, int *height ) const +// Must be a frame type window +// +void wxWindow::DoGetClientSize( + int* pWidth +, int* pHeight +) const { - // TODO: -} + HWND hWnd = GetHwnd(); + HWND hWndClient; + RECTL vRect; + + hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); + ::WinQueryWindowRect(hWndClient, &vRect); + + if (pWidth) + *pWidth = vRect.xRight; + if (pHeight) + *pHeight = vRect.yTop; +} // end of wxWindow::DoGetClientSize -void wxWindow::DoMoveWindow(int x, int y, int width, int height) +void wxWindow::DoMoveWindow( + int nX +, int nY +, int nWidth +, int nHeight +) { - // TODO: -} + if ( !::WinSetWindowPos( GetHwnd() + ,HWND_TOP + ,(LONG)nX + ,(LONG)nY + ,(LONG)nWidth + ,(LONG)nHeight + ,SWP_SIZE | SWP_MOVE + )) + { + wxLogLastError("MoveWindow"); + } +} // end of wxWindow::DoMoveWindow -// set the size of the window: if the dimensions are positive, just use them, +// +// Set the size of the window: if the dimensions are positive, just use them, // but if any of them is equal to -1, it means that we must find the value for // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in // which case -1 is a valid value for x and y) @@ -950,53 +1134,263 @@ void wxWindow::DoMoveWindow(int x, int y, int width, int height) // If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate // the width/height to best suit our contents, otherwise we reuse the current // width/height -void wxWindow::DoSetSize(int x, int y, - int width, int height, - int sizeFlags) +// +void wxWindow::DoSetSize( + int nX +, int nY +, int nWidth +, int nHeight +, int nSizeFlags +) { - // TODO: -} + // + // Get the current size and position... + // + int nCurrentX; + int nCurrentY; + int nCurrentWidth; + int nCurrentHeight; + wxSize vSize(-1, -1); + + GetPosition( &nCurrentX + ,&nCurrentY + ); + GetSize( &nCurrentWidth + ,&nCurrentHeight + ); -void wxWindow::DoSetClientSize(int width, int height) + // + // ... and don't do anything (avoiding flicker) if it's already ok + // + if ( nX == nCurrentX && + nY == nCurrentY && + nWidth == nCurrentWidth && + nHeight == nCurrentHeight + ) + { + return; + } + + if (nX == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + nX = nCurrentX; + if (nY == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + nY = nCurrentY; + + AdjustForParentClientOrigin( nX + ,nY + ,nSizeFlags + ); + + if (nWidth == -1) + { + if (nSizeFlags & wxSIZE_AUTO_WIDTH) + { + vSize = DoGetBestSize(); + nWidth = vSize.x; + } + else + { + // + // Just take the current one + // + nWidth = nCurrentWidth; + } + } + + if (nHeight == -1) + { + if (nSizeFlags & wxSIZE_AUTO_HEIGHT) + { + if (vSize.x == -1) + { + vSize = DoGetBestSize(); + } + nHeight = vSize.y; + } + else + { + // just take the current one + nHeight = nCurrentHeight; + } + } + + DoMoveWindow( nX + ,nY + ,nWidth + ,nHeight + ); +} // end of wxWindow::DoSetSize + +void wxWindow::DoSetClientSize( + int nWidth +, int nHeight +) { - // TODO: -} + wxWindow* pParent = GetParent(); + HWND hWnd = GetHwnd(); + HWND hParentWnd = (HWND)0; + HWND hClientWnd = (HWND)0; + RECTL vRect; + RECT vRect2; + RECT vRect3; + + hClientWnd = ::WinWindowFromID(GetHwnd(), FID_CLIENT); + ::WinQueryWindowRect(hClientWnd, &vRect2); + + if (pParent) + hParentWnd = (HWND) pParent->GetHWND(); + + ::WinQueryWindowRect(hWnd, &vRect); + ::WinQueryWindowRect(hParentWnd, &vRect3); + // + // Find the difference between the entire window (title bar and all) + // and the client area; add this to the new client size to move the + // window. OS/2 is backward from windows on height + // + int nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth; + int nActualHeight = vRect2.yTop - vRect2.yBottom - vRect.yTop + nHeight; + + // + // If there's a parent, must subtract the parent's bottom left corner + // since MoveWindow moves relative to the parent + // + POINTL vPoint; + + vPoint.x = vRect2.xLeft; + vPoint.y = vRect2.yBottom; + if (pParent) + { + vPoint.x -= vRect3.xLeft; + vPoint.y -= vRect3.yBottom; + } + + DoMoveWindow( vPoint.x + ,vPoint.y + ,nActualWidth + ,nActualHeight + ); + + wxSizeEvent vEvent( wxSize( nWidth + ,nHeight + ) + ,m_windowId + ); + + vEvent.SetEventObject(this); + GetEventHandler()->ProcessEvent(vEvent); +} // end of wxWindow::DoSetClientSize wxPoint wxWindow::GetClientAreaOrigin() const { return wxPoint(0, 0); -} +} // end of wxWindow::GetClientAreaOrigin -void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) +void wxWindow::AdjustForParentClientOrigin( + int& rX +, int& rY +, int nSizeFlags +) { - // TODO: -} + // + // Don't do it for the dialogs/frames - they float independently of their + // parent + // + if (!IsTopLevel()) + { + wxWindow* pParent = GetParent(); + + if (!(nSizeFlags & wxSIZE_NO_ADJUSTMENTS) && pParent) + { + wxPoint vPoint(pParent->GetClientAreaOrigin()); + rX += vPoint.x; + rY += vPoint.y; + } + } +} // end of wxWindow::AdjustForParentClientOrigin // --------------------------------------------------------------------------- // text metrics // --------------------------------------------------------------------------- -int wxWindow::GetCharHeight() const +int wxWindow::GetCharHeight() const { - // TODO: - return(1); -} + HPS hPs; + FONTMETRICS vFontMetrics; + BOOL bRc; -int wxWindow::GetCharWidth() const + hPs = ::WinGetPS(GetHwnd()); + + if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics)) + return (0); + else + return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender); + ::WinReleasePS(hPs); +} // end of wxWindow::GetCharHeight + +int wxWindow::GetCharWidth() const { - // TODO: - return(1); -} + HPS hPs; + FONTMETRICS vFontMetrics; + + hPs = ::WinGetPS(GetHwnd()); -void wxWindow::GetTextExtent( const wxString& string - ,int* x - ,int* y - ,int* descent - ,int* externalLeading - ,const wxFont* theFont - ) const + if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics)) + return (0); + else + return(vFontMetrics.lAveCharWidth); + ::WinReleasePS(hPs); +} // end of wxWindow::GetCharWidth + +void wxWindow::GetTextExtent( + const wxString& rString +, int* pX +, int* pY +, int* pDescent +, int* pExternalLeading +, const wxFont* pTheFont +) const { - // TODO: + const wxFont* pFontToUse = pTheFont; + HPS hPs; + + hPs = ::WinGetPS(GetHwnd()); +/* +// TODO: Will have to play with fonts later + + if (!pFontToUse) + pFontToUse = &m_font; + + HFONT hFnt = 0; + HFONT hFfontOld = 0; + + if (pFontToUse && pFontToUse->Ok()) + { + ::GpiCreateLog + hFnt = (HFONT)((wxFont *)pFontToUse)->GetResourceHandle(); // const_cast + if (hFnt) + hFontOld = (HFONT)SelectObject(dc,fnt); + } + + SIZE sizeRect; + TEXTMETRIC tm; + GetTextExtentPoint(dc, string, (int)string.Length(), &sizeRect); + GetTextMetrics(dc, &tm); + + if ( fontToUse && fnt && hfontOld ) + SelectObject(dc, hfontOld); + + ReleaseDC(hWnd, dc); + + if ( x ) + *x = sizeRect.cx; + if ( y ) + *y = sizeRect.cy; + if ( descent ) + *descent = tm.tmDescent; + if ( externalLeading ) + *externalLeading = tm.tmExternalLeading; +*/ + ::WinReleasePS(hPs); } #if wxUSE_CARET && WXWIN_COMPATIBILITY @@ -1004,35 +1398,60 @@ void wxWindow::GetTextExtent( const wxString& string // Caret manipulation // --------------------------------------------------------------------------- -void wxWindow::CreateCaret(int w, int h) +void wxWindow::CreateCaret( + int nWidth +, int nHeight +) { - // TODO: -} + SetCaret(new wxCaret( this + ,nWidth + ,nHeight + )); +} // end of wxWindow::CreateCaret -void wxWindow::CreateCaret(const wxBitmap *bitmap) +void wxWindow::CreateCaret( + const wxBitmap* pBitmap +) { - // TODO: -} + wxFAIL_MSG("not implemented"); +} // end of wxWindow::CreateCaret -void wxWindow::ShowCaret(bool show) +void wxWindow::ShowCaret( + bool bShow +) { - // TODO: -} + wxCHECK_RET( m_caret, "no caret to show" ); + + m_caret->Show(bShow); +} // end of wxWindow::ShowCaret void wxWindow::DestroyCaret() { - // TODO: -} + SetCaret(NULL); +} // end of wxWindow::DestroyCaret -void wxWindow::SetCaretPos(int x, int y) +void wxWindow::SetCaretPos( + int nX +, int nY) { - // TODO: -} + wxCHECK_RET( m_caret, "no caret to move" ); + + m_caret->Move( nX + ,nY + ); +} // end of wxWindow::SetCaretPos -void wxWindow::GetCaretPos(int *x, int *y) const +void wxWindow::GetCaretPos( + int* pX +, int* pY +) const { - // TODO: -} + wxCHECK_RET( m_caret, "no caret to get position of" ); + + m_caret->GetPosition( pX + ,pY + ); +} // end of wxWindow::GetCaretPos #endif //wxUSE_CARET