X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdf1e7142564c55f5299f1f2d0909090534eb97c..2912e35f1774b140b44cb9f9568aa5ab8122cd02:/src/os2/window.cpp diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 7673bf4463..81250fb80f 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -9,7 +9,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// // For compilers that support precompilation, includes "wx.h". +// #include "wx/wxprec.h" #ifndef WX_PRECOMP @@ -64,14 +66,21 @@ #include -// place compiler, OS specific includes here - +// +// Place compiler, OS specific includes here +// -// standard macros -- these are for OS/2 PM, but most GUI's have something similar +// +// Standard macros -- these are for OS/2 PM, but most GUI's have something similar +// #ifndef GET_X_LPARAM +// // SHORT1FROMMP -- LOWORD +// #define GET_X_LPARAM(mp) ((unsigned short)(unsigned long)(mp)) +// // SHORT2FROMMP -- HIWORD +// #define GET_Y_LPARAM(mp) ((unsigned short)(unsigned long)(mp >> 16)) #endif // GET_X_LPARAM @@ -79,34 +88,59 @@ // global variables // --------------------------------------------------------------------------- -// the last Windows message we got (MT-UNSAFE) -extern WXMSGID s_currentMsg; -extern wxList WXDLLEXPORT wxPendingDelete; -extern wxChar wxCanvasClassName[]; +// +// The last Windows message we got (MT-UNSAFE) +// +extern WXMSGID s_currentMsg; -wxMenu *wxCurrentPopupMenu = NULL; -wxList *wxWinHandleList = NULL; +wxMenu* wxCurrentPopupMenu = NULL; +extern wxList WXDLLEXPORT wxPendingDelete; +extern wxChar* wxCanvasClassName; +wxList* wxWinHandleList = NULL; // --------------------------------------------------------------------------- // private functions // --------------------------------------------------------------------------- + +// // the window proc for all our windows; most gui's have something similar +// MRESULT wxWndProc( HWND hWnd ,ULONG message ,MPARAM mp1 ,MPARAM mp2 ); -void wxRemoveHandleAssociation(wxWindow *win); -void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); -wxWindow *wxFindWinFromHandle(WXHWND hWnd); +#ifdef __WXDEBUG__ + const char *wxGetMessageName(int message); +#endif //__WXDEBUG__ + +void wxRemoveHandleAssociation(wxWindow* pWin); +void wxAssociateWinWithHandle( HWND hWnd + ,wxWindow* pWin + ); +wxWindow* wxFindWinFromHandle(WXHWND hWnd); + +// +// This magical function is used to translate VK_APPS key presses to right +// mouse clicks +// +static void TranslateKbdEventToMouse( wxWindow* pWin + ,int* pX + ,int* pY + ,MPARAM* pFlags + ); + +// +// get the current state of SHIFT/CTRL keys +// +static inline bool IsShiftDown() { return (::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x8000) != 0; } +static inline bool IsCtrlDown() { return (::WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x8000) != 0; } // --------------------------------------------------------------------------- // event tables // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) -#endif BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) @@ -119,71 +153,92 @@ END_EVENT_TABLE() // implementation // =========================================================================== -// Find an item given the MS Windows id -wxWindow *wxWindow::FindItem(long id) const +// +// Find an item given the PM Window id +// +wxWindow* wxWindow::FindItem( + long lId +) const { - wxWindowList::Node *current = GetChildren().GetFirst(); - while (current) - { - wxWindow *childWin = current->GetData(); - - wxWindow *wnd = childWin->FindItem(id); - if ( wnd ) - return wnd; + wxControl* pItem = wxDynamicCast( this + ,wxControl + ); - if ( childWin->IsKindOf(CLASSINFO(wxControl)) ) + if (pItem) + { + // + // I it we or one of our "internal" children? + // + if (pItem->GetId() == lId || + (pItem->GetSubcontrols().Index(lId) != wxNOT_FOUND)) { - wxControl *item = (wxControl *)childWin; - if ( item->GetId() == id ) - return item; - else - { - // In case it's a 'virtual' control (e.g. radiobox) - if ( item->GetSubcontrols().Member((wxObject *)id) ) - return item; - } + return pItem; } - - current = current->GetNext(); } - return NULL; -} + wxWindowList::Node* pCurrent = GetChildren().GetFirst(); + + while (pCurrent) + { + wxWindow* pChildWin = pCurrent->GetData(); + wxWindow* pWnd = pChildWin->FindItem(lId); -// Find an item given the MS Windows handle -wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const + if (pWnd) + return pWnd; + + pCurrent = pCurrent->GetNext(); + } + return(NULL); +} // end of wxWindow::FindItem + +// +// Find an item given the PM Window handle +// +wxWindow* wxWindow::FindItemByHWND( + WXHWND hWnd +, bool bControlOnly +) const { - wxWindowList::Node *current = GetChildren().GetFirst(); - while (current) + wxWindowList::Node* pCurrent = GetChildren().GetFirst(); + + while (pCurrent) { - wxWindow *parent = current->GetData(); + wxWindow* pParent = pCurrent->GetData(); + // // Do a recursive search. - wxWindow *wnd = parent->FindItemByHWND(hWnd); - if ( wnd ) - return wnd; + // + wxWindow* pWnd = pParent->FindItemByHWND(hWnd); - if ( !controlOnly || parent->IsKindOf(CLASSINFO(wxControl)) ) + if (pWnd) + return(pWnd); + + if (!bControlOnly || pParent->IsKindOf(CLASSINFO(wxControl))) { - wxWindow *item = current->GetData(); - if ( item->GetHWND() == hWnd ) - return item; + wxWindow* pItem = pCurrent->GetData(); + + if (pItem->GetHWND() == hWnd) + return(pItem); else { - if ( item->ContainsHWND(hWnd) ) - return item; + if (pItem->ContainsHWND(hWnd)) + return(pItem); } } - - current = current->GetNext(); + pCurrent = pCurrent->GetNext(); } - return NULL; -} + return(NULL); +} // end of wxWindow::FindItemByHWND +// // Default command handler -bool wxWindow::OS2Command(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) +// +bool wxWindow::OS2Command( + WXUINT WXUNUSED(uParam) +, WXWORD WXUNUSED(uId) +) { - return FALSE; + return(FALSE); } // ---------------------------------------------------------------------------- @@ -192,79 +247,141 @@ bool wxWindow::OS2Command(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) void wxWindow::Init() { - // generic + // + // Generic + // InitBase(); + // // PM specific - m_doubleClickAllowed = 0; - m_winCaptured = FALSE; + // + m_bDoubleClickAllowed = 0; + m_bWinCaptured = FALSE; m_isBeingDeleted = FALSE; - m_oldWndProc = 0; - m_useCtl3D = FALSE; - m_mouseInWindow = FALSE; + m_fnOldWndProc = 0; + m_bUseCtl3D = FALSE; + m_bMouseInWindow = FALSE; + // // wxWnd + // m_hMenu = 0; - m_hWnd = 0; - // pass WM_GETDLGCODE to DefWindowProc() + // + // Pass WM_GETDLGCODE to DefWindowProc() m_lDlgCode = 0; - m_xThumbSize = 0; - m_yThumbSize = 0; - m_backgroundTransparent = FALSE; + m_nXThumbSize = 0; + m_nYThumbSize = 0; + m_bBackgroundTransparent = FALSE; - // as all windows are created with WS_VISIBLE style... + // + // As all windows are created with WS_VISIBLE style... + // m_isShown = TRUE; #if wxUSE_MOUSEEVENT_HACK - m_lastMouseX = - m_lastMouseY = -1; - m_lastMouseEvent = -1; + m_lLastMouseX = + m_lLastMouseY = -1; + m_nLastMouseEvent = -1; #endif // wxUSE_MOUSEEVENT_HACK -} +} // wxWindow::Init +// // Destructor +// wxWindow::~wxWindow() { m_isBeingDeleted = TRUE; OS2DetachWindowMenu(); - // delete handlers? if (m_parent) m_parent->RemoveChild(this); DestroyChildren(); if (m_hWnd) { - if(!WinDestroyWindow(GetHWND())) + if(!::WinDestroyWindow(GetHWND())) wxLogLastError(wxT("DestroyWindow")); + // // remove hWnd <-> wxWindow association + // wxRemoveHandleAssociation(this); } -} - -bool wxWindow::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") ); - - if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; - - parent->AddChild(this); - - // TODO: PM Specific initialization - OS2Create(m_windowId, parent, wxCanvasClassName, this, NULL, - pos.x, pos.y, - WidthDefault(size.x), HeightDefault(size.y), - msflags, NULL, exStyle); - return TRUE; -} +} // end of wxWindow::~wxWindow + +bool wxWindow::Create( + wxWindow* pParent +, wxWindowID vId +, const wxPoint& rPos +, const wxSize& rSize +, long lStyle +, const wxString& rName +) +{ + wxCHECK_MSG(pParent, FALSE, wxT("can't create wxWindow without parent")); + + if ( !CreateBase( pParent + ,vId + ,rPos + ,rSize + ,lStyle + ,wxDefaultValidator + ,rName + )) + return(FALSE); + + pParent->AddChild(this); + + ULONG ulFlags = 0L; + + // + // Frame windows and their derivatives only + // + if (lStyle & wxBORDER) + ulFlags |= FCF_BORDER; + if (lStyle & wxTHICK_FRAME ) + ulFlags |= FCF_SIZEBORDER; + + // + // Some generic window styles + // + ulFlags |= WS_VISIBLE; + if (lStyle & wxCLIP_CHILDREN ) + ulFlags |= WS_CLIPCHILDREN; + + bool bWant3D; + WXDWORD dwExStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D); + + // + // OS/2 PM doesn't have "extended" styles but if the library specifies + // them and we are creating a frame window then at least give it a border + // + if ( bWant3D || + (m_windowStyle & wxSIMPLE_BORDER) || + (m_windowStyle & wxRAISED_BORDER ) || + (m_windowStyle & wxSUNKEN_BORDER) || + (m_windowStyle & wxDOUBLE_BORDER) + ) + { + ulFlags |= FCF_BORDER; + } + OS2Create( m_windowId + ,pParent + ,wxCanvasClassName + ,this + ,NULL + ,rPos.x + ,rPos.y + ,WidthDefault(rSize.x) + ,HeightDefault(rSize.y) + ,ulFlags + ,NULL + ,dwExStyle + ); + return(TRUE); +} // end of wxWindow::Create // --------------------------------------------------------------------------- // basic operations @@ -272,74 +389,177 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, void wxWindow::SetFocus() { - // TODO: -} + HWND hWnd = GetHwnd(); + + if (hWnd) + ::WinSetFocus(HWND_DESKTOP, hWnd); +} // end of wxWindow::SetFocus -wxWindow* wxWindow::FindFocus() +wxWindow* wxWindowBase::FindFocus() { - wxWindow* window = NULL; - // TODO: - return(window); -} + HWND hWnd = ::WinQueryFocus(HWND_DESKTOP); + + if (hWnd) + { + return wxFindWinFromHandle((WXHWND)hWnd); + } + return NULL; +} // wxWindowBase::FindFocus -bool wxWindow::Enable(bool enable) // check if base implementation is OK +bool wxWindow::Enable( + bool bEnable +) { - // TODO: + if (!wxWindowBase::Enable(bEnable)) + return(FALSE); + + HWND hWnd = GetHwnd(); + + if ( hWnd ) + ::WinEnableWindow(hWnd, (BOOL)bEnable); + + wxWindowList::Node* pNode = GetChildren().GetFirst(); + + while (pNode) + { + wxWindow* pChild = pNode->GetData(); + + pChild->Enable(bEnable); + pNode = pNode->GetNext(); + } return(TRUE); -} +} // end of wxWindow::Enable -bool wxWindow::Show(bool show) // check if base implementation is OK +bool wxWindow::Show( + bool bShow +) { - // TODO: + if (!wxWindowBase::Show(bShow)) + return(FALSE); + + HWND hWnd = GetHwnd(); + + ::WinShowWindow(hWnd, bShow); + + if (bShow) + { + ::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE | SWP_ZORDER); + } return(TRUE); -} +} // end of wxWindow::Show void wxWindow::Raise() { - // TODO: -} + ::WinSetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER | SWP_ACTIVATE); +} // end of wxWindow::Raise void wxWindow::Lower() { - // TODO: -} + ::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER | SWP_DEACTIVATE); +} // end of wxWindow::Lower -void wxWindow::SetTitle( const wxString& title) +void wxWindow::SetTitle( + const wxString& rTitle +) { - SetWindowText(GetHwnd(), title.c_str()); -} + ::WinSetWindowText(GetHwnd(), rTitle.c_str()); +} // end of wxWindow::SetTitle wxString wxWindow::GetTitle() const { return wxGetWindowText(GetHWND()); -} +} // end of wxWindow::GetTitle void wxWindow::CaptureMouse() { - // TODO: -} + HWND hWnd = GetHwnd(); + + if (hWnd && !m_bWinCaptured) + { + ::WinSetCapture(HWND_DESKTOP, hWnd); + m_bWinCaptured = TRUE; + } +} // end of wxWindow::GetTitle void wxWindow::ReleaseMouse() { - // TODO: -} + if (m_bWinCaptured) + { + ::WinSetCapture(HWND_DESKTOP, NULLHANDLE); + m_bWinCaptured = FALSE; + } +} // end of wxWindow::ReleaseMouse -bool wxWindow::SetFont(const wxFont& f) +bool wxWindow::SetFont( + const wxFont& rFont +) { - // TODO: + if (!wxWindowBase::SetFont(rFont)) + { + // nothing to do + return(FALSE); + } + + HWND hWnd = GetHwnd(); + + if (hWnd != 0) + { + wxChar zFont[128]; + + sprintf(zFont, "%d.%s", rFont.GetPointSize(), rFont.GetFaceName().c_str()); + return(::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont), (PVOID)zFont)); + } return(TRUE); } -bool wxWindow::SetCursor(const wxCursor& cursor) // check if base implementation is OK +bool wxWindow::SetCursor( + const wxCursor& rCursor +) // check if base implementation is OK { - // TODO: - return(TRUE); -} + if ( !wxWindowBase::SetCursor(rCursor)) + { + // no change + return FALSE; + } + + wxASSERT_MSG( m_cursor.Ok(), + wxT("cursor must be valid after call to the base version")); + + HWND hWnd = GetHwnd(); + POINTL vPoint; + RECTL vRect; + HPS hPS; + HRGN hRGN; -void wxWindow::WarpPointer(int x_pos, int y_pos) + hPS = ::WinGetPS(hWnd); + + ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); + ::WinQueryWindowRect(hWnd, &vRect); + + hRGN = ::GpiCreateRegion(hPS, 1L, &vRect); + + if ((::GpiPtInRegion(hPS, hRGN, &vPoint) == PRGN_INSIDE) && !wxIsBusy()) + { + ::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR()); + } + return TRUE; +} // end of wxWindow::SetCursor + +void wxWindow::WarpPointer( + int nXPos +, int nYPos +) { - // TODO: -} + int nX = nXPos; + int nY = nYPos; + RECTL vRect; + + ::WinQueryWindowRect(GetHwnd(), &vRect); + nX += vRect.xLeft; + nY += vRect.yBottom; + + ::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY)); +} // end of wxWindow::WarpPointer #if WXWIN_COMPATIBILITY void wxWindow::OS2DeviceToLogical (float *x, float *y) const @@ -352,71 +572,131 @@ void wxWindow::OS2DeviceToLogical (float *x, float *y) const // --------------------------------------------------------------------------- #if WXWIN_COMPATIBILITY -void wxWindow::SetScrollRange(int orient, int range, bool refresh) -{ - // TODO: +void wxWindow::SetScrollRange( + int nOrient +, int nRange +, bool bRefresh +) +{ + ::WinSendMsg(GetHwnd(), SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, nRange)); +} // end of wxWindow::SetScrollRange + +void wxWindow::SetScrollPage( + int nOrient +, int nPage +, bool bRefresh +) +{ + if ( orient == wxHORIZONTAL ) + m_xThumbSize = page; + else + m_yThumbSize = page; } -void wxWindow::SetScrollPage(int orient, int page, bool refresh) +int wxWindow::OldGetScrollRange( + int nOrient +) const { - // TODO: -} + MRESULT mRc; + HWND hWnd = GetHwnd(); -int wxWindow::OldGetScrollRange(int orient) const -{ - // TODO: - return 0; -} + if (hWnd) + { + mRc = WinSendMsg(hWnd, SBM_QUERYRANGE, (MPARAM)0L, (MPARAM)0L); + return(SHORT2FROMMR(mRc)); + } + return 0; +} // end of wxWindow::OldGetScrollRange + +int wxWindow::GetScrollPage( + int nOrient +) const +{ + if (nOrient == wxHORIZONTAL) + return m_nXThumbSize; + else + return m_nYThumbSize; +} // end of wxWindow::GetScrollPage +#endif // WXWIN_COMPATIBILITY -int wxWindow::GetScrollPage(int orient) const +int wxWindow::GetScrollPos( + int nOrient +) const { - // TODO: - return(1); -} + return((int)::WinSendMsg(GetHwnd(), SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL)); +} // end of wxWindow::GetScrollPos -int wxWindow::GetScrollPos(int orient) const +int wxWindow::GetScrollRange( + int nOrient +) const { - // TODO: - return(1); -} + MRESULT mr; -int wxWindow::GetScrollRange(int orient) const -{ - // TODO: - return(1); -} + mr = ::WinSendMsg(GetHwnd(), SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL); + return((int)SHORT2FROMMR(mr)); +} // end of wxWindow::GetScrollRange -int wxWindow::GetScrollThumb(int orient) const +int wxWindow::GetScrollThumb( + int nOrient +) const { - // TODO: - return(1); -} + WNDPARAMS vWndParams; + PSBCDATA pSbcd; + + ::WinSendMsg(GetHwnd(), WM_QUERYWINDOWPARAMS, (MPARAM)&vWndParams, (MPARAM)NULL); + pSbcd = (PSBCDATA)vWndParams.pCtlData; + return((int)pSbcd->posThumb); +} // end of wxWindow::GetScrollThumb -void wxWindow::SetScrollPos( int orient - ,int pos - ,bool refresh - ) +void wxWindow::SetScrollPos( + int nOrient +, int nPos +, bool bRefresh +) { - // TODO: -} + ::WinSendMsg(GetHwnd(), SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL); +} // end of wxWindow::SetScrollPos( -void wxWindow::SetScrollbar( int orient - ,int pos - ,int thumbVisible - ,int range - ,bool refresh - ) +void wxWindow::SetScrollbar( + int nOrient +, int nPos +, int nThumbVisible +, int nRange +, bool bRefresh +) { - // TODO: -} + ::WinSendMsg(GetHwnd(), SBM_SETSCROLLBAR, (MPARAM)nPos, MPFROM2SHORT(0, nRange)); + if (nOrient == wxHORIZONTAL) + { + m_nXThumbSize = nThumbVisible; + } + else + { + m_nYThumbSize = nThumbVisible; + } +} // end of wxWindow::SetScrollbar -void wxWindow::ScrollWindow( int dx - ,int dy - ,const wxRect* rect - ) +void wxWindow::ScrollWindow( + int nDx +, int nDy +, const wxRect* pRect +) { - // TODO: -} + RECTL vRect2; + + if (pRect) + { + vRect2.xLeft = pRect->x; + vRect2.yTop = pRect->y; + vRect2.xRight = pRect->x + pRect->width; + vRect2.yBottom = pRect->y + pRect->height; + } + + if (pRect) + ::WinScrollWindow(GetHwnd(), (LONG)nDx, (LONG)nDy, &vRect2, NULL, NULLHANDLE, NULL, 0L); + else + ::WinScrollWindow(GetHwnd(), nDx, nDy, NULL, NULL, NULLHANDLE, NULL, 0L); +} // end of wxWindow::ScrollWindow // --------------------------------------------------------------------------- // subclassing @@ -424,16 +704,18 @@ void wxWindow::ScrollWindow( int dx void wxWindow::SubclassWin(WXHWND hWnd) { - wxASSERT_MSG( !m_oldWndProc, wxT("subclassing window twice?") ); + HAB hab; + HWND hwnd = (HWND)hWnd; + + wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") ); - HWND hwnd = (HWND)hWnd; /* * TODO: implement something like this: -* wxCHECK_RET( ::IsWindow(hwnd), wxT("invalid HWND in SubclassWin") ); +* wxCHECK_RET(::WinIsWindow(hab, hwnd), wxT("invalid HWND in SubclassWin") ); * * wxAssociateWinWithHandle(hwnd, this); * -* m_oldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC); +* m_fnOldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC); * SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc); */ } @@ -463,29 +745,20 @@ void wxWindow::UnsubclassWin() */ } +// // Make a Windows extended style from the given wxWindows window style -WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders) -{ - // TODO: - WXDWORD exStyle = 0; -/* - if ( style & wxTRANSPARENT_WINDOW ) - exStyle |= WS_EX_TRANSPARENT; - - if ( !eliminateBorders ) - { - if ( style & wxSUNKEN_BORDER ) - exStyle |= WS_EX_CLIENTEDGE; - if ( style & wxDOUBLE_BORDER ) - exStyle |= WS_EX_DLGMODALFRAME; - if ( style & wxRAISED_BORDER ) - exStyle |= WS_EX_WINDOWEDGE; - if ( style & wxSTATIC_BORDER ) - exStyle |= WS_EX_STATICEDGE; - } -*/ +// +WXDWORD wxWindow::MakeExtendedStyle( + long lStyle +, bool bEliminateBorders +) +{ + // + // PM does not support extended style + // + WXDWORD exStyle = 0; 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 @@ -493,7 +766,7 @@ WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders) WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D) const { - DWORD exStyle; // remove after implementation doe + DWORD exStyle = 0L; // remove after implementation doe /* TODO: this ought to be fun * // If matches certain criteria, then assume no 3D effects @@ -684,12 +957,6 @@ void wxWindow::DoSetSize(int x, int y, // TODO: } -// for a generic window there is no natural best size - just use the current one -wxSize wxWindow::DoGetBestSize() -{ - return GetSize(); -} - void wxWindow::DoSetClientSize(int width, int height) { // TODO: @@ -783,7 +1050,7 @@ bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y ) // pre/post message processing // =========================================================================== -MRESULT wxWindow::OS2DefWindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +MRESULT wxWindow::OS2DefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { // TODO: return (MRESULT)0; @@ -831,7 +1098,7 @@ void wxWindow::UnpackScroll(WXWPARAM wParam, WXLPARAM lParam, void wxWindow::UnpackCtlColor(WXWPARAM wParam, WXLPARAM lParam, WXWORD *nCtlColor, WXHDC *hdc, WXHWND *hwnd) { - *nCtlColor = CTLCOLOR_BTN; + *nCtlColor = 0; // TODO: CTLCOLOR_BTN; *hwnd = (WXHWND)lParam; *hdc = (WXHDC)wParam; } @@ -839,7 +1106,7 @@ void wxWindow::UnpackCtlColor(WXWPARAM wParam, WXLPARAM lParam, void wxWindow::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam, WXWORD *item, WXWORD *flags, WXHMENU *hmenu) { - *item = (WXWORD)wParam; + *item = (WXWORD)LOWORD(wParam); *flags = HIWORD(wParam); *hmenu = (WXHMENU)lParam; } @@ -853,7 +1120,7 @@ void wxWindow::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam, wxWindow *wxWndHook = NULL; // Main window proc -MRESULT wxWndProc(HWND hWnd, UINT message, MPARAM wParam, MPARAM lParam) +MRESULT wxWndProc(HWND hWnd, ULONG message, MPARAM wParam, MPARAM lParam) { // trace all messages - useful for the debugging #ifdef __WXDEBUG__ @@ -892,15 +1159,15 @@ MRESULT wxWndProc(HWND hWnd, UINT message, MPARAM wParam, MPARAM lParam) else { if ( wnd ) - rc = wnd->OS2WindowProc(hWnd, message, wParam, lParam); + rc = wnd->OS2WindowProc(message, wParam, lParam); else - rc = DefWindowProc( hWnd, message, wParam, lParam ); + rc = 0; //TODO: DefWindowProc( hWnd, message, wParam, lParam ); } return rc; } -MRESULT wxWindow::OS2WindowProc(HWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +MRESULT wxWindow::OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { // did we process the message? bool processed = FALSE; @@ -1249,11 +1516,11 @@ MRESULT wxWindow::OS2WindowProc(HWND hWnd, WXUINT message, WXWPARAM wParam, WXLP rc.result = MSWDefWindowProc(message, wParam, lParam); } */ - return rc.result; + return (MRESULT)0; } // Dialog window proc -MRESULT wxDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +MRESULT wxDlgProc(HWND hWnd, UINT message, MPARAM wParam, MPARAM lParam) { // TODO: /* @@ -1273,7 +1540,6 @@ MRESULT wxDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return (MRESULT)0; } -wxList *wxWinHandleList = NULL; wxWindow *wxFindWinFromHandle(WXHWND hWnd) { wxNode *node = wxWinHandleList->Find((long)hWnd); @@ -1551,7 +1817,7 @@ bool wxWindow::HandleDestroy() #if wxUSE_DRAG_AND_DROP if ( m_dropTarget != NULL ) { - m_dropTarget->Revoke(m_hWnd); +// m_dropTarget->Revoke(m_hWnd); delete m_dropTarget; m_dropTarget = NULL; @@ -1570,12 +1836,16 @@ bool wxWindow::HandleActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate)) { + // TODO: + /* wxActivateEvent event(wxEVT_ACTIVATE, (state == WA_ACTIVE) || (state == WA_CLICKACTIVE), m_windowId); event.SetEventObject(this); return GetEventHandler()->ProcessEvent(event); + */ + return FALSE; } bool wxWindow::HandleSetFocus(WXHWND WXUNUSED(hwnd)) @@ -1654,6 +1924,8 @@ bool wxWindow::HandleSetCursor(WXHWND hWnd, if ( GetHWND() == hWnd ) { // don't set cursor when the mouse is not in the client part +// TODO +/* if ( nHitTest == HTCLIENT || nHitTest == HTERROR ) { HCURSOR hcursor = 0; @@ -1692,6 +1964,7 @@ bool wxWindow::HandleSetCursor(WXHWND hWnd, return TRUE; } } +*/ } return FALSE; @@ -1701,7 +1974,7 @@ bool wxWindow::HandleSetCursor(WXHWND hWnd, // owner drawn stuff // --------------------------------------------------------------------------- -bool wxWindow::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct) +bool wxWindow::OS2OnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct) { // TODO: /* @@ -1789,7 +2062,8 @@ bool wxWindow::HandleCtlColor(WXHBRUSH *brush, WXLPARAM lParam) { WXHBRUSH hBrush = 0; - +// TODO: +/* if ( nCtlColor == CTLCOLOR_DLG ) { hBrush = OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam); @@ -1805,6 +2079,8 @@ bool wxWindow::HandleCtlColor(WXHBRUSH *brush, *brush = hBrush; return hBrush != 0; +*/ + return FALSE; } // Define for each class of dialog and control @@ -1861,14 +2137,14 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) bool wxWindow::HandlePaint() { // TODO: - Return FALSE; + return FALSE; } bool wxWindow::HandleEraseBkgnd(WXHDC hdc) { // Prevents flicker when dragging - if ( ::IsIconic(GetHwnd()) ) - return TRUE; +// if ( ::IsIconic(GetHwnd()) ) +// return TRUE; wxDC dc; @@ -1930,6 +2206,8 @@ bool wxWindow::HandleSize(int w, int h, WXUINT WXUNUSED(flag)) bool wxWindow::HandleGetMinMaxInfo(void *mmInfo) { +// TODO: +/* MINMAXINFO *info = (MINMAXINFO *)mmInfo; bool rc = FALSE; @@ -1959,6 +2237,8 @@ bool wxWindow::HandleGetMinMaxInfo(void *mmInfo) } return rc; +*/ + return FALSE; } // --------------------------------------------------------------------------- @@ -1972,7 +2252,7 @@ bool wxWindow::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) wxMenu *popupMenu = wxCurrentPopupMenu; wxCurrentPopupMenu = NULL; - return popupMenu->MSWCommand(cmd, id); + return popupMenu->OS2Command(cmd, id); } wxWindow *win = FindItem(id); @@ -1982,7 +2262,7 @@ bool wxWindow::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) } if ( win ) - return win->MSWCommand(cmd, id); + return win->OS2Command(cmd, id); return FALSE; } @@ -1999,6 +2279,8 @@ bool wxWindow::HandleSysCommand(WXWPARAM wParam, WXLPARAM lParam) void wxWindow::InitMouseEvent(wxMouseEvent& event, int x, int y, WXUINT flags) { +// TODO: +/* event.m_x = x; event.m_y = y; event.m_shiftDown = ((flags & MK_SHIFT) != 0); @@ -2014,7 +2296,7 @@ void wxWindow::InitMouseEvent(wxMouseEvent& event, int x, int y, WXUINT flags) m_lastMouseY = y; m_lastMouseEvent = event.GetEventType(); #endif // wxUSE_MOUSEEVENT_HACK - +*/ } bool wxWindow::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags) @@ -2045,10 +2327,10 @@ bool wxWindow::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags) bool wxWindow::HandleMouseMove(int x, int y, WXUINT flags) { - if ( !m_mouseInWindow ) + if ( !m_bMouseInWindow ) { // Generate an ENTER event - m_mouseInWindow = TRUE; + m_bMouseInWindow = TRUE; wxMouseEvent event(wxEVT_ENTER_WINDOW); InitMouseEvent(event, x, y, flags); @@ -2119,7 +2401,7 @@ bool wxWindow::OS2OnScroll(int orientation, WXWORD wParam, { wxWindow *child = wxFindWinFromHandle(control); if ( child ) - return child->MSWOnScroll(orientation, wParam, pos, control); + return child->OS2OnScroll(orientation, wParam, pos, control); } wxScrollWinEvent event; @@ -2311,8 +2593,8 @@ wxWindow *wxGetActiveWindow() // Windows keyboard hook. Allows interception of e.g. F1, ESCAPE // in active frames and dialogs, regardless of where the focus is. -static HHOOK wxTheKeyboardHook = 0; -static FARPROC wxTheKeyboardHookProc = 0; +//static HHOOK wxTheKeyboardHook = 0; +//static FARPROC wxTheKeyboardHookProc = 0; int wxKeyboardHook(int nCode, WORD wParam, DWORD lParam); void wxSetKeyboardHook(bool doIt) @@ -2749,3 +3031,5 @@ const char *wxGetMessageName(int message) return NULL; } +#endif // __WXDEBUG__ +