X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d0986499b16895f5a25555ae0d3626a3d27e840..74b1f0b45e0f0bc7e25c5f32bb495e3e4bcd3392:/src/os2/window.cpp?ds=sidebyside diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 1618cb714a..7a44b19018 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: windows.cpp +// Name: src/os2/window.cpp // Purpose: wxWindow // Author: David Webster // Modified by: @@ -14,13 +14,13 @@ // #include "wx/wxprec.h" +#include "wx/window.h" + #ifndef WX_PRECOMP #define INCL_DOS #define INCL_PM #include - #include "wx/window.h" #include "wx/accel.h" - #include "wx/setup.h" #include "wx/menu.h" #include "wx/dc.h" #include "wx/dcclient.h" @@ -28,16 +28,32 @@ #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" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/textctrl.h" + #include "wx/menuitem.h" #include #endif -#if wxUSE_OWNER_DRAWN +#include "wx/os2/dcclient.h" + +#if wxUSE_OWNER_DRAWN #include "wx/ownerdrw.h" #endif @@ -45,25 +61,20 @@ #include "wx/dnd.h" #endif -#include "wx/menuitem.h" -#include "wx/log.h" - #include "wx/os2/private.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif +#if wxUSE_NOTEBOOK + #include "wx/notebook.h" +#endif + #if wxUSE_CARET #include "wx/caret.h" #endif // wxUSE_CARET -#include "wx/intl.h" -#include "wx/log.h" - - -#include "wx/textctrl.h" - #include // @@ -88,21 +99,32 @@ # define CW_USEDEFAULT ((int)0x80000000) #endif +#ifndef VK_OEM_1 + #define VK_OEM_1 0xBA + #define VK_OEM_PLUS 0xBB + #define VK_OEM_COMMA 0xBC + #define VK_OEM_MINUS 0xBD + #define VK_OEM_PERIOD 0xBE + #define VK_OEM_2 0xBF + #define VK_OEM_3 0xC0 + #define VK_OEM_4 0xDB + #define VK_OEM_5 0xDC + #define VK_OEM_6 0xDD + #define VK_OEM_7 0xDE +#endif + // --------------------------------------------------------------------------- // global variables // --------------------------------------------------------------------------- // -// The last Windows message we got (MT-UNSAFE) +// The last PM message we got (MT-UNSAFE) // QMSG s_currentMsg; -wxMenu* wxCurrentPopupMenu = NULL; -extern wxList WXDLLEXPORT wxPendingDelete; -#if !defined(__VISAGECPP__) || (__IBMCPP__ < 400) -extern wxChar wxCanvasClassName[]; -#endif -wxList* wxWinHandleList = NULL; +#if wxUSE_MENUS_NATIVE +extern wxMenu* wxCurrentPopupMenu; +#endif // wxUSE_MENUS_NATIVE // --------------------------------------------------------------------------- // private functions @@ -118,98 +140,109 @@ MRESULT EXPENTRY wxWndProc( HWND hWnd ); #ifdef __WXDEBUG__ - const char *wxGetMessageName(int message); + const wxChar *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 +wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin + ,short* pnX + ,short* pnY ); +void wxRemoveHandleAssociation(wxWindowOS2* pWin); +void wxAssociateWinWithHandle( HWND hWnd + ,wxWindowOS2* pWin + ); +wxWindow* wxFindWinFromHandle(WXHWND hWnd); // // 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; } +static inline bool IsKeyDown(LONG key) {return (::WinGetKeyState(HWND_DESKTOP, key) & 0x8000) != 0; } +static inline bool IsShiftDown() { return IsKeyDown(VK_SHIFT); } +static inline bool IsCtrlDown() { return IsKeyDown(VK_CTRL); } + +static wxWindow* gpWinBeingCreated = NULL; + // --------------------------------------------------------------------------- // event tables // --------------------------------------------------------------------------- +// in wxUniv-OS/2 this class is abstract because it doesn't have DoPopupMenu() +// method +#ifdef __WXUNIVERSAL__ + IMPLEMENT_ABSTRACT_CLASS(wxWindowOS2, wxWindowBase) +#else // __WXPM__ IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) +#endif // __WXUNIVERSAL__/__WXPM__ -BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) - EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) - EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindow::OnInitDialog) - EVT_IDLE(wxWindow::OnIdle) +BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase) + EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground) + EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged) + EVT_IDLE(wxWindowOS2::OnIdle) + EVT_SET_FOCUS(wxWindowOS2::OnSetFocus) END_EVENT_TABLE() // =========================================================================== // implementation // =========================================================================== +// --------------------------------------------------------------------------- +// wxWindow utility functions +// --------------------------------------------------------------------------- + // // Find an item given the PM Window id // -wxWindow* wxWindow::FindItem( +wxWindow* wxWindowOS2::FindItem( long lId ) const { - wxControl* pItem = wxDynamicCast( this - ,wxControl - ); +#if wxUSE_CONTROLS + wxControl* pItem = wxDynamicCast(this, wxControl); if (pItem) { // // I it we or one of our "internal" children? // - if (pItem->GetId() == lId || - (pItem->GetSubcontrols().Index(lId) != wxNOT_FOUND)) + if (pItem->GetId() == lId +#ifndef __WXUNIVERSAL__ + || (pItem->GetSubcontrols().Index(lId) != wxNOT_FOUND) +#endif + ) { return pItem; } } +#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 wxWindow::FindItem +} // end of wxWindowOS2::FindItem // // Find an item given the PM Window handle // -wxWindow* wxWindow::FindItemByHWND( +wxWindow* wxWindowOS2::FindItemByHWND( WXHWND hWnd , 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. @@ -219,9 +252,13 @@ wxWindow* wxWindow::FindItemByHWND( if (pWnd) return(pWnd); - if (!bControlOnly || pParent->IsKindOf(CLASSINFO(wxControl))) + if (!bControlOnly +#if wxUSE_CONTROLS + || pParent->IsKindOf(CLASSINFO(wxControl)) +#endif // wxUSE_CONTROLS + ) { - wxWindow* pItem = pCurrent->GetData(); + wxWindow* pItem = current->GetData(); if (pItem->GetHWND() == hWnd) return(pItem); @@ -231,107 +268,130 @@ wxWindow* wxWindow::FindItemByHWND( return(pItem); } } - pCurrent = pCurrent->GetNext(); + current = current->GetNext(); } return(NULL); -} // end of wxWindow::FindItemByHWND +} // end of wxWindowOS2::FindItemByHWND // // Default command handler // -bool wxWindow::OS2Command( - WXUINT WXUNUSED(uParam) -, WXWORD WXUNUSED(uId) -) +bool wxWindowOS2::OS2Command( WXUINT WXUNUSED(uParam), + WXWORD WXUNUSED(uId) ) { - return(FALSE); + return false; } // ---------------------------------------------------------------------------- // constructors and such // ---------------------------------------------------------------------------- -void wxWindow::Init() +void wxWindowOS2::Init() { - // - // Generic - // - InitBase(); - // // PM specific // - m_bDoubleClickAllowed = 0; - m_bWinCaptured = FALSE; + m_bWinCaptured = false; - m_isBeingDeleted = FALSE; - m_fnOldWndProc = 0; - m_bUseCtl3D = FALSE; - m_bMouseInWindow = FALSE; + m_fnOldWndProc = NULL; + m_bUseCtl3D = false; + m_bMouseInWindow = false; + m_bLastKeydownProcessed = false; // // wxWnd // - m_hMenu = 0; - m_hWnd = 0; + m_hMenu = 0L; + m_hWnd = 0L; + m_hWndScrollBarHorz = 0L; + m_hWndScrollBarVert = 0L; + + memset(&m_vWinSwp, '\0', sizeof (SWP)); // // Pass WM_GETDLGCODE to DefWindowProc() + // m_lDlgCode = 0; m_nXThumbSize = 0; m_nYThumbSize = 0; - m_bBackgroundTransparent = FALSE; + m_bBackgroundTransparent = false; // // As all windows are created with WS_VISIBLE style... // - m_isShown = TRUE; + m_isShown = true; #if wxUSE_MOUSEEVENT_HACK m_lLastMouseX = m_lLastMouseY = -1; m_nLastMouseEvent = -1; #endif // wxUSE_MOUSEEVENT_HACK -} // wxWindow::Init +} // wxWindowOS2::Init // // Destructor // -wxWindow::~wxWindow() +wxWindowOS2::~wxWindowOS2() { - m_isBeingDeleted = TRUE; + SendDestroyEvent(); + + for (wxWindow* pWin = GetParent(); pWin; pWin = pWin->GetParent()) + { + wxTopLevelWindow* pFrame = wxDynamicCast(pWin, wxTopLevelWindow); + + if (pFrame) + { + if (pFrame->GetLastFocus() == this) + pFrame->SetLastFocus(NULL); + } + } - OS2DetachWindowMenu(); - if (m_parent) - m_parent->RemoveChild(this); DestroyChildren(); if (m_hWnd) { -// UnsubclassWin(); - if(!::WinDestroyWindow(GetHWND())) + { wxLogLastError(wxT("DestroyWindow")); + } // // remove hWnd <-> wxWindow association // wxRemoveHandleAssociation(this); } -} // end of wxWindow::~wxWindow - -bool wxWindow::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxString& rName -) +} // end of wxWindowOS2::~wxWindowOS2 + +// real construction (Init() must have been called before!) +bool wxWindowOS2::Create( wxWindow* pParent, + wxWindowID vId, + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + const wxString& rName ) { - HWND hParent = NULLHANDLE; + HWND hParent = NULLHANDLE; + ULONG ulCreateFlags = 0; + WXDWORD dwExStyle = 0; + + wxCHECK_MSG(pParent, false, wxT("can't create wxWindow without parent")); + +#if wxUSE_STATBOX + // + // wxGTK doesn't allow to create controls with static box as the parent so + // this will result in a crash when the program is ported to wxGTK - warn + // about it + // + // the correct solution is to create the controls as siblings of the + // static box + // + wxASSERT_MSG( !wxDynamicCast(pParent, wxStaticBox), + wxT("wxStaticBox can't be used as a window parent!") ); +#endif // wxUSE_STATBOX - wxCHECK_MSG(pParent, FALSE, wxT("can't create wxWindow without parent")); + // Ensure groupbox backgrounds are painted + if (IsKindOf(CLASSINFO(wxPanel))) + lStyle &= ~wxCLIP_CHILDREN; if ( !CreateBase( pParent ,vId @@ -341,67 +401,76 @@ bool wxWindow::Create( ,wxDefaultValidator ,rName )) - return(FALSE); + return false; if (pParent) { pParent->AddChild(this); hParent = GetWinHwnd(pParent); - } - else - hParent = HWND_DESKTOP; - - ULONG ulCreateFlags = 0L; + if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow))) + ulCreateFlags |= WS_CLIPSIBLINGS; + } // // Most wxSTYLES are really PM Class specific styles and will be // set in those class create procs. PM's basic windows styles are // very limited. // - if (lStyle & wxCLIP_CHILDREN ) - ulCreateFlags |= WS_CLIPCHILDREN; + ulCreateFlags |= OS2GetCreateWindowFlags(&dwExStyle); - // - // Empty stuff for now since PM has no custome 3D effects - // Doesn't mean someone cannot make some up though - // - bool bWant3D; - WXDWORD dwExStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D); + +#ifdef __WXUNIVERSAL__ + // no 3d effects, we draw them ourselves + WXDWORD exStyle = 0; +#endif // !wxUniversal + if (lStyle & wxPOPUP_WINDOW) + { + ulCreateFlags &= ~WS_VISIBLE; + m_isShown = false; + } + else + { + ulCreateFlags |= WS_VISIBLE; + } // - // Generic OS/2 Windows are created with no owner, no Z Order, no Control data, - // and no presentation parameters + // Generic OS/2 Windows have no Control Data but other classes + // that call OS2Create may have some. // - OS2Create( hParent - ,(PSZ)wxCanvasClassName - ,rName.c_str() - ,ulCreateFlags - ,rPos.x - ,rPos.y - ,WidthDefault(rSize.x) - ,HeightDefault(rSize.y) - ,NULLHANDLE - ,NULLHANDLE - ,m_windowId - ); - - return(TRUE); -} // end of wxWindow::Create + return(OS2Create( (PSZ)wxCanvasClassName + ,rName.c_str() + ,ulCreateFlags + ,rPos + ,rSize + ,NULL // Control Data + ,dwExStyle + ,true // Child + )); +} // end of wxWindowOS2::Create // --------------------------------------------------------------------------- // basic operations // --------------------------------------------------------------------------- -void wxWindow::SetFocus() +void wxWindowOS2::SetFocus() { HWND hWnd = GetHwnd(); + wxCHECK_RET( hWnd, wxT("can't set focus to invalid window") ); if (hWnd) ::WinSetFocus(HWND_DESKTOP, hWnd); -} // end of wxWindow::SetFocus +} // end of wxWindowOS2::SetFocus + +void wxWindowOS2::SetFocusFromKbd() +{ + // + // Nothing else to do under OS/2 + // + wxWindowBase::SetFocusFromKbd(); +} // end of wxWindowOS2::SetFocus -wxWindow* wxWindowBase::FindFocus() +wxWindow* wxWindowBase::DoFindFocus() { HWND hWnd = ::WinQueryFocus(HWND_DESKTOP); @@ -410,38 +479,19 @@ wxWindow* wxWindowBase::FindFocus() return wxFindWinFromHandle((WXHWND)hWnd); } return NULL; -} // wxWindowBase::FindFocus +} // wxWindowBase::DoFindFocus -bool wxWindow::Enable( - bool bEnable -) +void wxWindowOS2::DoEnable( bool bEnable ) { - 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 bShow -) +bool wxWindowOS2::Show( bool bShow ) { if (!wxWindowBase::Show(bShow)) - return(FALSE); + return false; HWND hWnd = GetHwnd(); @@ -451,107 +501,95 @@ bool wxWindow::Show( { ::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE | SWP_ZORDER); } - return(TRUE); -} // end of wxWindow::Show + return true; +} // end of wxWindowOS2::Show -void wxWindow::Raise() +void wxWindowOS2::Raise() { ::WinSetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER | SWP_ACTIVATE); -} // end of wxWindow::Raise +} // end of wxWindowOS2::Raise -void wxWindow::Lower() +void wxWindowOS2::Lower() { ::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER | SWP_DEACTIVATE); -} // end of wxWindow::Lower +} // end of wxWindowOS2::Lower -void wxWindow::SetTitle( - const wxString& rTitle -) +void wxWindowOS2::SetLabel( const wxString& label ) { - ::WinSetWindowText(GetHwnd(), rTitle.c_str()); -} // end of wxWindow::SetTitle + ::WinSetWindowText(GetHwnd(), label.c_str()); +} // end of wxWindowOS2::SetLabel -wxString wxWindow::GetTitle() const +wxString wxWindowOS2::GetLabel() const { return wxGetWindowText(GetHWND()); -} // end of wxWindow::GetTitle +} // end of wxWindowOS2::GetLabel -void wxWindow::CaptureMouse() +void wxWindowOS2::DoCaptureMouse() { - HWND hWnd = GetHwnd(); + HWND hWnd = GetHwnd(); if (hWnd && !m_bWinCaptured) { ::WinSetCapture(HWND_DESKTOP, hWnd); - m_bWinCaptured = TRUE; + m_bWinCaptured = true; } -} // end of wxWindow::GetTitle +} // end of wxWindowOS2::DoCaptureMouse -void wxWindow::ReleaseMouse() +void wxWindowOS2::DoReleaseMouse() { if (m_bWinCaptured) { ::WinSetCapture(HWND_DESKTOP, NULLHANDLE); - m_bWinCaptured = FALSE; + m_bWinCaptured = false; } -} // end of wxWindow::ReleaseMouse +} // end of wxWindowOS2::ReleaseMouse -bool wxWindow::SetFont( - const wxFont& rFont -) +/* static */ wxWindow* wxWindowBase::GetCapture() +{ + HWND hwnd = ::WinQueryCapture(HWND_DESKTOP); + return hwnd ? wxFindWinFromHandle((WXHWND)hwnd) : NULL; +} // end of wxWindowBase::GetCapture + +bool wxWindowOS2::SetFont( const wxFont& rFont ) { if (!wxWindowBase::SetFont(rFont)) { // nothing to do - return(FALSE); + return false; } - HWND hWnd = GetHwnd(); - - if (hWnd != 0) - { - wxChar zFont[128]; + HWND hWnd = GetHwnd(); - sprintf(zFont, "%d.%s", rFont.GetPointSize(), rFont.GetFaceName().c_str()); - return(::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont), (PVOID)zFont)); - } - return(TRUE); -} + wxOS2SetFont( hWnd, rFont ); + return true; +} // end of wxWindowOS2::SetFont -bool wxWindow::SetCursor( - const wxCursor& rCursor -) // check if base implementation is OK +// check if base implementation is OK +bool wxWindowOS2::SetCursor( const wxCursor& rCursor) { if ( !wxWindowBase::SetCursor(rCursor)) { // no change - return FALSE; + 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; - - hPS = ::WinGetPS(hWnd); - - ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); - ::WinQueryWindowRect(hWnd, &vRect); + if ( m_cursor.Ok() ) { + HWND hWnd = GetHwnd(); + POINTL vPoint; + RECTL vRect; - hRGN = ::GpiCreateRegion(hPS, 1L, &vRect); + ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); + ::WinQueryWindowRect(hWnd, &vRect); - if ((::GpiPtInRegion(hPS, hRGN, &vPoint) == PRGN_INSIDE) && !wxIsBusy()) - { - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR()); + if (::WinPtInRect(vHabmain, &vRect, &vPoint) && !wxIsBusy()) + { + ::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR()); + } } - return TRUE; -} // end of wxWindow::SetCursor + return true; +} // end of wxWindowOS2::SetCursor -void wxWindow::WarpPointer( +void wxWindowOS2::WarpPointer( int nXPos , int nYPos ) @@ -565,169 +603,318 @@ void wxWindow::WarpPointer( nY += vRect.yBottom; ::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY)); -} // end of wxWindow::WarpPointer +} // end of wxWindowOS2::WarpPointer -#if WXWIN_COMPATIBILITY -void wxWindow::OS2DeviceToLogical (float *x, float *y) const -{ -} -#endif // WXWIN_COMPATIBILITY // --------------------------------------------------------------------------- // scrolling stuff // --------------------------------------------------------------------------- -#if WXWIN_COMPATIBILITY -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 wxWindowOS2::GetScrollPos( int nOrient -, int nPage -, bool bRefresh -) +) const { - if ( orient == wxHORIZONTAL ) - m_xThumbSize = page; + if (nOrient == wxHORIZONTAL) + return((int)::WinSendMsg(m_hWndScrollBarHorz, SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL)); else - m_yThumbSize = page; -} + return((int)::WinSendMsg(m_hWndScrollBarVert, SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL)); +} // end of wxWindowOS2::GetScrollPos -int wxWindow::OldGetScrollRange( +int wxWindowOS2::GetScrollRange( int nOrient ) const { - MRESULT mRc; - HWND hWnd = GetHwnd(); + MRESULT mr; - if (hWnd) - { - mRc = WinSendMsg(hWnd, SBM_QUERYRANGE, (MPARAM)0L, (MPARAM)0L); - return(SHORT2FROMMR(mRc)); - } - return 0; -} // end of wxWindow::OldGetScrollRange + if (nOrient == wxHORIZONTAL) + mr = ::WinSendMsg(m_hWndScrollBarHorz, SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL); + else + mr = ::WinSendMsg(m_hWndScrollBarVert, SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL); + return((int)SHORT2FROMMR(mr)); +} // end of wxWindowOS2::GetScrollRange -int wxWindow::GetScrollPage( +int wxWindowOS2::GetScrollThumb( int nOrient ) const { - if (nOrient == wxHORIZONTAL) + if (nOrient == wxHORIZONTAL ) return m_nXThumbSize; else return m_nYThumbSize; -} // end of wxWindow::GetScrollPage -#endif // WXWIN_COMPATIBILITY +} // end of wxWindowOS2::GetScrollThumb -int wxWindow::GetScrollPos( +void wxWindowOS2::SetScrollPos( int nOrient -) const +, int nPos +, bool WXUNUSED(bRefresh) +) { - return((int)::WinSendMsg(GetHwnd(), SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL)); -} // end of wxWindow::GetScrollPos - -int wxWindow::GetScrollRange( - int nOrient -) const + if (nOrient == wxHORIZONTAL ) + ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL); + else + ::WinSendMsg(m_hWndScrollBarVert, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL); +} // end of wxWindowOS2::SetScrollPos + +void wxWindowOS2::SetScrollbar( int nOrient, + int nPos, + int nThumbVisible, + int nRange, + bool WXUNUSED(bRefresh) ) { - MRESULT mr; + HWND hWnd = GetHwnd(); + int nOldRange = nRange - nThumbVisible; + int nRange1 = nOldRange; + int nPageSize = nThumbVisible; + int nVSBWidth = wxSystemSettingsNative::GetMetric(wxSYS_VSCROLL_X, + this); + int nHSBHeight = wxSystemSettingsNative::GetMetric(wxSYS_HSCROLL_Y, + this); + + SBCDATA vInfo; + ULONG ulStyle = WS_VISIBLE | WS_SYNCPAINT; + SWP vSwp; + SWP vSwpOwner; + HWND hWndParent; + HWND hWndClient; + wxWindow* pParent = GetParent(); - mr = ::WinSendMsg(GetHwnd(), SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL); - return((int)SHORT2FROMMR(mr)); -} // end of wxWindow::GetScrollRange + if (pParent && pParent->IsKindOf(CLASSINFO(wxFrame))) + { + wxFrame* pFrame; -int wxWindow::GetScrollThumb( - int nOrient -) const -{ - WNDPARAMS vWndParams; - PSBCDATA pSbcd; + pFrame = wxDynamicCast(pParent, wxFrame); + hWndParent = pFrame->GetFrame(); + hWndClient = GetHwndOf(pParent); + } + else + { + if (pParent) + hWndParent = GetHwndOf(pParent); + else + hWndParent = GetHwnd(); + hWndClient = hWndParent; + } + ::WinQueryWindowPos(hWndClient, &vSwp); + ::WinQueryWindowPos(hWnd, &vSwpOwner); - ::WinSendMsg(GetHwnd(), WM_QUERYWINDOWPARAMS, (MPARAM)&vWndParams, (MPARAM)NULL); - pSbcd = (PSBCDATA)vWndParams.pCtlData; - return((int)pSbcd->posThumb); -} // end of wxWindow::GetScrollThumb + if (nPageSize > 1 && nRange > 0) + { + nRange1 += (nPageSize - 1); + } -void wxWindow::SetScrollPos( - int nOrient -, int nPos -, bool bRefresh -) -{ - ::WinSendMsg(GetHwnd(), SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL); -} // end of wxWindow::SetScrollPos( + vInfo.cb = sizeof(SBCDATA); + vInfo.posFirst = 0; + vInfo.posLast = (SHORT)nRange1; + vInfo.posThumb = (SHORT)nPos; -void wxWindow::SetScrollbar( - int nOrient -, int nPos -, int nThumbVisible -, int nRange -, bool bRefresh -) -{ - ::WinSendMsg(GetHwnd(), SBM_SETSCROLLBAR, (MPARAM)nPos, MPFROM2SHORT(0, nRange)); - if (nOrient == wxHORIZONTAL) + if (nOrient == wxHORIZONTAL ) { - m_nXThumbSize = nThumbVisible; + ulStyle |= SBS_HORZ; + if (m_hWndScrollBarHorz == 0L) + { + // + // Since the scrollbars are usually created before the owner is + // sized either via an OnSize event directly or via sizers or + // layout constraints, we will initially just use the coords of + // the parent window (this is usually a frame client window). But + // the bars themselves, are children of the parent frame (i.e + // siblings of the frame client. The owner, however is the actual + // window being scrolled (or at least the one responsible for + // handling the scroll events). The owner will be resized later, + // as it is usually a child of a top level window, and when that + // is done its scrollbars will be resized and repositioned as well. + // + m_hWndScrollBarHorz = ::WinCreateWindow( hWndParent + ,WC_SCROLLBAR + ,(PSZ)NULL + ,ulStyle + ,vSwp.x + ,vSwp.y + ,vSwp.cx - nVSBWidth + ,nHSBHeight + ,hWnd + ,HWND_TOP + ,60000 + ,&vInfo + ,NULL + ); + } + else + { + // + // The owner (the scrolled window) is a child of the Frame's + // client window, usually. The scrollbars are children of the + // frame, itself, and thus are positioned relative to the frame's + // origin, not the frame's client window origin. + // The starting x position is the same as the starting x position + // of the owner, but in terms of the parent frame. + // The starting y position is wxSYS_HSCROLL_Y pels below the + // origin of the owner in terms of the parent frame. + // The horz bar is the same width as the owner and wxSYS_HSCROLL_Y + // pels high. + // + if (nRange1 >= nThumbVisible) + { + ::WinSetWindowPos( m_hWndScrollBarHorz + ,HWND_TOP + ,vSwp.x + vSwpOwner.x + ,(vSwp.y + vSwpOwner.y) - nHSBHeight + ,vSwpOwner.cx + ,nHSBHeight + ,SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER + ); + ::WinSendMsg( m_hWndScrollBarHorz + ,SBM_SETSCROLLBAR + ,(MPARAM)nPos + ,MPFROM2SHORT(0, (SHORT)nRange1) + ); + ::WinSendMsg( m_hWndScrollBarHorz + ,SBM_SETTHUMBSIZE + ,MPFROM2SHORT( (SHORT)nThumbVisible + ,(SHORT)nRange1 + ) + ,(MPARAM)0 + ); + } + else + ::WinShowWindow(m_hWndScrollBarHorz, FALSE); + } } else { + ulStyle |= SBS_VERT; + if (m_hWndScrollBarVert == 0L) + { + // + // Since the scrollbars are usually created before the owner is + // sized either via an OnSize event directly or via sizers or + // layout constraints, we will initially just use the coords of + // the parent window (this is usually a frame client window). But + // the bars themselves, are children of the parent frame (i.e + // siblings of the frame client. The owner, however is the actual + // window being scrolled (or at least the one responsible for + // handling the scroll events). The owner will be resized later, + // as it is usually a child of a top level window, and when that + // is done its scrollbars will be resized and repositioned as well. + // + m_hWndScrollBarVert = ::WinCreateWindow( hWndParent + ,WC_SCROLLBAR + ,(PSZ)NULL + ,ulStyle + ,vSwp.x + vSwp.cx - nVSBWidth + ,vSwp.y + nHSBHeight + ,nVSBWidth + ,vSwp.cy - nHSBHeight + ,hWnd + ,HWND_TOP + ,60001 + ,&vInfo + ,NULL + ); + } + else + { + // + // The owner (the scrolled window) is a child of the Frame's + // client window, usually. The scrollbars are children of the + // frame, itself and thus are positioned relative to the frame's + // origin, not the frame's client window's origin. + // Thus, the x position will be frame client's x (usually a few + // pels inside the parent frame, plus the width of the owner. + // Since we may be using sizers or layout constraints for multiple + // child scrolled windows, the y position will be the frame client's + // y pos plus the scrolled windows y position, yielding the y + // position of the scrollbar relative to the parent frame (the vert + // scrollbar is on the right and starts at the bottom of the + // owner window). + // It is wxSYS_VSCROLL_X pels wide and the same height as the owner. + // + if (nRange1 >= nThumbVisible) + { + ::WinSetWindowPos( m_hWndScrollBarVert + ,HWND_TOP + ,vSwp.x + vSwpOwner.x + vSwpOwner.cx + ,vSwp.y + vSwpOwner.y + ,nVSBWidth + ,vSwpOwner.cy + ,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW + ); + ::WinSendMsg( m_hWndScrollBarVert + ,SBM_SETSCROLLBAR + ,(MPARAM)nPos + ,MPFROM2SHORT(0, (SHORT)nRange1) + ); + ::WinSendMsg( m_hWndScrollBarVert + ,SBM_SETTHUMBSIZE + ,MPFROM2SHORT( (SHORT)nThumbVisible + ,(SHORT)nRange1 + ) + ,(MPARAM)0 + ); + } + else + ::WinShowWindow(m_hWndScrollBarVert, FALSE); + } m_nYThumbSize = nThumbVisible; } -} // end of wxWindow::SetScrollbar +} // end of wxWindowOS2::SetScrollbar -void wxWindow::ScrollWindow( - int nDx -, int nDy -, const wxRect* pRect -) + +void wxWindowOS2::ScrollWindow( int nDx, + int nDy, + const wxRect* pRect ) { - RECTL vRect2; + RECTL vRect; + ::WinQueryWindowRect(GetHwnd(), &vRect); + int height = vRect.yTop; if (pRect) { - vRect2.xLeft = pRect->x; - vRect2.yTop = pRect->y; - vRect2.xRight = pRect->x + pRect->width; - vRect2.yBottom = pRect->y + pRect->height; + vRect.xLeft = pRect->x; + vRect.yTop = height - pRect->y; + vRect.xRight = pRect->x + pRect->width; + vRect.yBottom = vRect.yTop - 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 + nDy *= -1; // flip the sign of Dy as OS/2 is opposite Windows. + ::WinScrollWindow( GetHwnd() + ,(LONG)nDx + ,(LONG)nDy + ,&vRect + ,&vRect + ,NULL + ,NULL + ,SW_SCROLLCHILDREN | SW_INVALIDATERGN + ); +} // end of wxWindowOS2::ScrollWindow // --------------------------------------------------------------------------- // subclassing // --------------------------------------------------------------------------- -void wxWindow::SubclassWin( +void wxWindowOS2::SubclassWin( WXHWND hWnd ) { HWND hwnd = (HWND)hWnd; - wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") ); - wxCHECK_RET(::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in SubclassWin") ); + wxAssociateWinWithHandle( hWnd + ,(wxWindow*)this + ); + if (!wxCheckWindowWndProc( hWnd + ,(WXFARPROC)wxWndProc + )) + { + m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc); + } + else + { + m_fnOldWndProc = (WXFARPROC)NULL; + } +} // end of wxWindowOS2::SubclassWin -// wxAssociateWinWithHandle(hwnd, this); - - m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc); -// ::WinSetWindowULong(hwnd, QWL_USER, (ULONG)wxWndProc); -} // end of wxWindow::SubclassWin - -void wxWindow::UnsubclassWin() +void wxWindowOS2::UnsubclassWin() { -// wxRemoveHandleAssociation(this); - // // Restore old Window proc // @@ -735,101 +922,134 @@ void wxWindow::UnsubclassWin() if (m_hWnd) { -// m_hWnd = 0; - wxCHECK_RET( ::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in UnsubclassWin") ); PFNWP fnProc = (PFNWP)::WinQueryWindowPtr(hwnd, QWP_PFNWP); + if ( (m_fnOldWndProc != 0) && (fnProc != (PFNWP) m_fnOldWndProc)) { WinSubclassWindow(hwnd, (PFNWP)m_fnOldWndProc); m_fnOldWndProc = 0; } } -} // end of wxWindow::UnsubclassWin +} // end of wxWindowOS2::UnsubclassWin -// -// Make a Windows extended style from the given wxWindows window style -// -WXDWORD wxWindow::MakeExtendedStyle( - long lStyle -, bool bEliminateBorders +bool wxCheckWindowWndProc( + WXHWND hWnd +, WXFARPROC fnWndProc ) { - // - // PM does not support extended style - // - WXDWORD exStyle = 0; - return exStyle; -} // end of wxWindow::MakeExtendedStyle + static char zBuffer[512]; + CLASSINFO vCls; -// -// 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 dwDefaultBorderStyle -, bool* pbWant3D -) const + ::WinQueryClassName((HWND)hWnd, (LONG)512, (PCH)zBuffer); + ::WinQueryClassInfo(wxGetInstance(), (PSZ)zBuffer, &vCls); + return(fnWndProc == (WXFARPROC)vCls.pfnWindowProc); +} // end of WinGuiBase_CheckWindowWndProc + +void wxWindowOS2::SetWindowStyleFlag( + long lFlags +) { - WXDWORD dwStyle = 0L; + long lFlagsOld = GetWindowStyleFlag(); + + if (lFlags == lFlagsOld) + return; // - // Native PM does not have any specialize 3D effects like WIN32 does + // Update the internal variable // - *pbWant3D = FALSE; - return dwStyle; -} // end of wxWindow::Determine3DEffects + wxWindowBase::SetWindowStyleFlag(lFlags); -#if WXWIN_COMPATIBILITY -void wxWindow::OnCommand( - wxWindow& rWin -, wxCommandEvent& rEvent -) -{ - if (GetEventHandler()->ProcessEvent(rEvent)) - return; - if (m_parent) - m_parent->GetEventHandler()->OnCommand( rWin - ,rEvent - ); -} // end of wxWindow::OnCommand - -wxObject* wxWindow::GetChild( - int nNumber -) const -{ // - // Return a pointer to the Nth object in the Panel + // Now update the Windows style as well if needed - and if the window had + // been already created // - wxNode* pNode = GetChildren().First(); - int n = nNumber; + if (!GetHwnd()) + return; - while (pNode && n--) - pNode = pNode->Next(); - if (pNode) + WXDWORD dwExstyle; + WXDWORD dwExstyleOld; + long lStyle = OS2GetStyle( lFlags + ,&dwExstyle + ); + long lStyleOld = OS2GetStyle( lFlagsOld + ,&dwExstyleOld + ); + + if (lStyle != lStyleOld) { - wxObject* pObj = (wxObject*)pNode->Data(); - return(pObj); + // + // Some flags (e.g. WS_VISIBLE or WS_DISABLED) should not be changed by + // this function so instead of simply setting the style to the new + // value we clear the bits which were set in styleOld but are set in + // the new one and set the ones which were not set before + // + long lStyleReal = ::WinQueryWindowULong(GetHwnd(), QWL_STYLE); + + lStyleReal &= ~lStyleOld; + lStyleReal |= lStyle; + + ::WinSetWindowULong(GetHwnd(), QWL_STYLE, lStyleReal); } - else - return NULL; -} // end of wxWindow::GetChild +} // end of wxWindowOS2::SetWindowStyleFlag + +WXDWORD wxWindowOS2::OS2GetStyle( long lFlags, + WXDWORD* WXUNUSED(pdwExstyle) ) const +{ + WXDWORD dwStyle = 0L; + + if (lFlags & wxCLIP_CHILDREN ) + dwStyle |= WS_CLIPCHILDREN; + + if (lFlags & wxCLIP_SIBLINGS ) + dwStyle |= WS_CLIPSIBLINGS; + + return dwStyle; +} // end of wxWindowOS2::OS2GetStyle + +// +// Make a Windows extended style from the given wxWidgets window style +// +WXDWORD wxWindowOS2::MakeExtendedStyle( + long lStyle +, bool bEliminateBorders +) +{ + // + // Simply fill out with wxWindow extended styles. We'll conjure + // something up in OS2Create and all window redrawing pieces later + // + WXDWORD dwStyle = 0; -#endif // WXWIN_COMPATIBILITY + if (lStyle & wxTRANSPARENT_WINDOW ) + dwStyle |= wxTRANSPARENT_WINDOW; + + if (!bEliminateBorders) + { + if (lStyle & wxSUNKEN_BORDER) + dwStyle |= wxSUNKEN_BORDER; + if (lStyle & wxDOUBLE_BORDER) + dwStyle |= wxDOUBLE_BORDER; + if (lStyle & wxRAISED_BORDER ) + dwStyle |= wxRAISED_BORDER; + if (lStyle & wxSTATIC_BORDER) + dwStyle |= wxSTATIC_BORDER; + } + return dwStyle; +} // end of wxWindowOS2::MakeExtendedStyle // // Setup background and foreground colours correctly // -void wxWindow::SetupColours() +void wxWindowOS2::SetupColours() { if ( GetParent() ) SetBackgroundColour(GetParent()->GetBackgroundColour()); -} // end of wxWindow::SetupColours +} // end of wxWindowOS2::SetupColours -void wxWindow::OnIdle( - wxIdleEvent& rEvent +void wxWindowOS2::OnIdle( + wxIdleEvent& WXUNUSED(rEvent) ) { // @@ -845,7 +1065,7 @@ void wxWindow::OnIdle( // // Generate a LEAVE event // - m_bMouseInWindow = FALSE; + m_bMouseInWindow = false; // // Unfortunately the mouse button and keyboard state may have changed @@ -854,10 +1074,10 @@ void wxWindow::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); @@ -866,90 +1086,97 @@ void wxWindow::OnIdle( ,vPoint.y ,nState ); - (void)GetEventHandler()->ProcessEvent(rEvent); + (void)HandleWindowEvent(rEvent); } } - UpdateWindowUI(); -} // end of wxWindow::OnIdle + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); +} // end of wxWindowOS2::OnIdle // // Set this window to be the child of 'parent'. // -bool wxWindow::Reparent( - wxWindow* pParent -) +bool wxWindowOS2::Reparent( wxWindowBase* pParent) { if (!wxWindowBase::Reparent(pParent)) - return FALSE; + return false; - HWND hWndChild = GetHwnd(); - HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0; + HWND hWndChild = GetHwnd(); + HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0; ::WinSetParent(hWndChild, hWndParent, TRUE); - return TRUE; -} // end of wxWindow::Reparent + return true; +} // end of wxWindowOS2::Reparent -void wxWindow::Clear() +void wxWindowOS2::Update() { - wxClientDC vDc(this); - wxBrush vBrush( GetBackgroundColour() - ,wxSOLID - ); + ::WinUpdateWindow(GetHwnd()); +} // end of wxWindowOS2::Update - vDc.SetBackground(vBrush); - vDc.Clear(); -} // end of wxWindow::Clear +void wxWindowOS2::DoFreeze() +{ + ::WinSendMsg(GetHwnd(), WM_VRNDISABLED, (MPARAM)0, (MPARAM)0); +} // end of wxWindowOS2::Freeze -void wxWindow::Refresh( - bool bEraseBack -, const wxRect* pRect -) +void wxWindowOS2::DoThaw() { - HWND hWnd = GetHwnd(); + ::WinSendMsg(GetHwnd(), WM_VRNENABLED, (MPARAM)TRUE, (MPARAM)0); - if (hWnd) - { - if (pRect) - { - RECTL vOs2Rect; + // + // We need to refresh everything or otherwise he invalidated area is not + // repainted. + // + Refresh(); +} // end of wxWindowOS2::Thaw + +void wxWindowOS2::Refresh( bool bEraseBack, + const wxRect* pRect ) +{ + HWND hWnd = GetHwnd(); + + if (hWnd) + { + 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); } else ::WinInvalidateRect(hWnd, NULL, bEraseBack); + if (m_hWndScrollBarHorz != NULLHANDLE) + ::WinInvalidateRect(m_hWndScrollBarHorz, NULL, TRUE); + if (m_hWndScrollBarVert != NULLHANDLE) + ::WinInvalidateRect(m_hWndScrollBarVert, NULL, TRUE); } -} // end of wxWindow::Refresh +} // end of wxWindowOS2::Refresh // --------------------------------------------------------------------------- // drag and drop // --------------------------------------------------------------------------- #if wxUSE_DRAG_AND_DROP -void wxWindow::SetDropTarget( +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 wxWindow::SetDropTarget +} // end of wxWindowOS2::SetDropTarget #endif // // old style file-manager drag&drop support: we retain the old-style // DragAcceptFiles in parallel with SetDropTarget. // -void wxWindow::DragAcceptFiles( +void wxWindowOS2::DragAcceptFiles( bool bAccept ) { @@ -957,7 +1184,7 @@ void wxWindow::DragAcceptFiles( if (hWnd && bAccept) ::DrgAcceptDroppedFiles(hWnd, NULL, NULL, DO_COPY, 0L); -} // end of wxWindow::DragAcceptFiles +} // end of wxWindowOS2::DragAcceptFiles // ---------------------------------------------------------------------------- // tooltips @@ -965,7 +1192,7 @@ void wxWindow::DragAcceptFiles( #if wxUSE_TOOLTIPS -void wxWindow::DoSetToolTip( +void wxWindowOS2::DoSetToolTip( wxToolTip* pTooltip ) { @@ -973,7 +1200,7 @@ void wxWindow::DoSetToolTip( if (m_tooltip) m_tooltip->SetWindow(this); -} // end of wxWindow::DoSetToolTip +} // end of wxWindowOS2::DoSetToolTip #endif // wxUSE_TOOLTIPS @@ -982,14 +1209,22 @@ void wxWindow::DoSetToolTip( // --------------------------------------------------------------------------- // Get total size -void wxWindow::DoGetSize( +void wxWindowOS2::DoGetSize( int* pWidth , int* pHeight ) const { - HWND hWnd = GetHwnd(); + HWND hWnd; RECTL vRect; + if (IsKindOf(CLASSINFO(wxFrame))) + { + wxFrame* pFrame = wxDynamicCast(this, wxFrame); + hWnd = pFrame->GetFrame(); + } + else + hWnd = GetHwnd(); + ::WinQueryWindowRect(hWnd, &vRect); if (pWidth) @@ -997,51 +1232,56 @@ void wxWindow::DoGetSize( if (pHeight ) // OS/2 PM is backwards from windows *pHeight = vRect.yTop - vRect.yBottom; -} // end of wxWindow::DoGetSize +} // end of wxWindowOS2::DoGetSize -void wxWindow::DoGetPosition( +void wxWindowOS2::DoGetPosition( int* pX , int* pY ) const { - HWND hWnd = GetHwnd(); - RECT vRect; + // + // Return parameters assume wxWidgets coordinate system + // + HWND hWnd; + SWP vSwp; POINTL vPoint; - - ::WinQueryWindowRect(hWnd, &vRect); - - vPoint.x = vRect.xLeft; - vPoint.y = vRect.yBottom; + wxWindow* pParent = GetParent(); // - // We do the adjustments with respect to the parent only for the "real" - // children, not for the dialogs/frames + // It would seem that WinQueryWindowRect would be the correlary to + // the WIN32 WinGetRect, but unlike WinGetRect which returns the window + // origin position in screen coordinates, WinQueryWindowRect returns it + // relative to itself, i.e. (0,0). To get the same under PM we must + // use WinQueryWindowPos. This call, unlike the WIN32 call, however, + // returns a position relative to it's parent, so no parent adujstments + // are needed under OS/2. Also, windows should be created using + // wxWindow coordinates, i.e 0,0 is the TOP left. // - if (!IsTopLevel()) + if (IsKindOf(CLASSINFO(wxFrame))) { - HWND hParentWnd = 0; - wxWindow* pParent = GetParent(); + wxFrame* pFrame = wxDynamicCast(this, wxFrame); + hWnd = pFrame->GetFrame(); + } + else + hWnd = GetHwnd(); - if (pParent) - hParentWnd = GetWinHwnd(pParent); + ::WinQueryWindowPos(hWnd, &vSwp); - // - // Since we now have the absolute screen coords, if there's a parent we - // must subtract its bottom left corner - // - if (hParentWnd) - { - RECTL vRect2; + vPoint.x = vSwp.x; + vPoint.y = vSwp.y; - ::WinQueryWindowRect(hParentWnd, &vRect2); - vPoint.x -= vRect.xLeft; - vPoint.y -= vRect.yBottom; - } + // We need to convert to wxWidgets coordinates + int vHeight; + DoGetSize(NULL,&vHeight); + wxWindow* pWindow = wxDynamicCast(this,wxWindow); + vPoint.y = pWindow->GetOS2ParentHeight(pParent) - vPoint.y - vHeight; - // - // 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). - // + // + // 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). + // + if (pParent) + { wxPoint vPt(pParent->GetClientAreaOrigin()); vPoint.x -= vPt.x; @@ -1052,9 +1292,9 @@ void wxWindow::DoGetPosition( *pX = vPoint.x; if (pY) *pY = vPoint.y; -} // end of wxWindow::DoGetPosition +} // end of wxWindowOS2::DoGetPosition -void wxWindow::DoScreenToClient( +void wxWindowOS2::DoScreenToClient( int* pX , int* pY ) const @@ -1065,12 +1305,12 @@ void wxWindow::DoScreenToClient( ::WinQueryWindowPos(hWnd, &vSwp); if (pX) - *pX -= vSwp.x; + *pX += vSwp.x; if (pY) - *pY -= vSwp.y; -} // end of wxWindow::DoScreenToClient + *pY += vSwp.y; +} // end of wxWindowOS2::DoScreenToClient -void wxWindow::DoClientToScreen( +void wxWindowOS2::DoClientToScreen( int* pX , int* pY ) const @@ -1084,49 +1324,205 @@ void wxWindow::DoClientToScreen( *pX += vSwp.x; if (pY) *pY += vSwp.y; -} // end of wxWindow::DoClientToScreen +} // end of wxWindowOS2::DoClientToScreen // // Get size *available for subwindows* i.e. excluding menu bar etc. // Must be a frame type window // -void wxWindow::DoGetClientSize( +void wxWindowOS2::DoGetClientSize( int* pWidth , int* pHeight ) const { HWND hWnd = GetHwnd(); - HWND hWndClient; RECTL vRect; - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); + ::WinQueryWindowRect(hWnd, &vRect); + if (IsKindOf(CLASSINFO(wxDialog))) + { + RECTL vTitle; + HWND hWndTitle; + // + // For a Dialog we have to explicitly request the client portion. + // For a Frame the hWnd IS the client window + // + hWndTitle = ::WinWindowFromID(hWnd, FID_TITLEBAR); + if (::WinQueryWindowRect(hWndTitle, &vTitle)) + { + if (vTitle.yTop - vTitle.yBottom == 0) + { + // + // Dialog has not been created yet, use a default + // + vTitle.yTop = 20; + } + vRect.yTop -= (vTitle.yTop - vTitle.yBottom); + } + + ULONG uStyle = ::WinQueryWindowULong(hWnd, QWL_STYLE); + // + // Deal with borders + // + if (uStyle & FCF_DLGBORDER) + { + vRect.xLeft += 4; + vRect.xRight -= 4; + vRect.yTop -= 4; + vRect.yBottom += 4; + } + else if (uStyle & FCF_SIZEBORDER) + { + vRect.xLeft += 4; + vRect.xRight -= 4; + vRect.yTop -= 4; + vRect.yBottom += 4; + } + else if (uStyle & FCF_BORDER) + { + vRect.xLeft += 2; + vRect.xRight -= 2; + vRect.yTop -= 2; + vRect.yBottom += 2; + } + else // make some kind of adjustment or top sizers ram into the titlebar! + { + vRect.xLeft += 3; + vRect.xRight -= 3; + vRect.yTop -= 3; + vRect.yBottom += 3; + } + } if (pWidth) - *pWidth = vRect.xRight; + *pWidth = vRect.xRight - vRect.xLeft; if (pHeight) - *pHeight = vRect.yTop; -} // end of wxWindow::DoGetClientSize + *pHeight = vRect.yTop - vRect.yBottom; +} // end of wxWindowOS2::DoGetClientSize -void wxWindow::DoMoveWindow( +void wxWindowOS2::DoMoveWindow( int nX , int nY , int nWidth , int nHeight ) { - if ( !::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,(LONG)nX - ,(LONG)nY - ,(LONG)nWidth - ,(LONG)nHeight - ,SWP_SIZE | SWP_MOVE - )) + // + // Input parameters assume wxWidgets coordinate system + // + RECTL vRect; + wxWindow* pParent = GetParent(); + HWND hWnd = GetHwnd(); + + if (pParent && !IsKindOf(CLASSINFO(wxDialog))) + { + int nOS2Height = GetOS2ParentHeight(pParent); + + nY = nOS2Height - (nY + nHeight); + } + else + { + RECTL vRect; + + ::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; + int nWidthFrameDelta = 0; + int nHeightFrameDelta = 0; + wxFrame* pFrame; + + pFrame = wxDynamicCast(this, wxFrame); + hWnd = pFrame->GetFrame(); + ::WinQueryWindowRect(hWnd, &vRect); + ::WinMapWindowPoints(hWnd, HWND_DESKTOP, (PPOINTL)&vRect, 2); + vFRect = vRect; + ::WinCalcFrameRect(hWnd, &vRect, TRUE); + nWidthFrameDelta = ((vRect.xLeft - vFRect.xLeft) + (vFRect.xRight - vRect.xRight)); + nHeightFrameDelta = ((vRect.yBottom - vFRect.yBottom) + (vFRect.yTop - vRect.yTop)); + // Input values refer to the window position relative to its parent + // which may be the Desktop so we need to calculate + // the new frame values to keep the wxWidgets frame origin constant + nY -= nHeightFrameDelta; + nWidth += nWidthFrameDelta; + nHeight += nHeightFrameDelta; + } + ::WinSetWindowPos( hWnd + ,HWND_TOP + ,(LONG)nX + ,(LONG)nY + ,(LONG)nWidth + ,(LONG)nHeight + ,SWP_SIZE | SWP_MOVE + ); + if (m_vWinSwp.cx == 0 && m_vWinSwp.cy == 0 && m_vWinSwp.fl == 0) + // + // Uninitialized + // + ::WinQueryWindowPos(hWnd, &m_vWinSwp); + else { - wxLogLastError("MoveWindow"); + // + // Handle resizing of scrolled windows. The target or window to + // be scrolled is the owner (gets the scroll notifications). The + // parent is usually the parent frame of the scrolled panel window. + // In order to show the scrollbars the target window will be shrunk + // by the size of the scroll bar widths and moved in the X and Y + // directon. That value will be computed as part of the diff for + // moving the children. Everytime the window is sized the + // toplevel OnSize is going to resize the panel to fit the client + // or the whole sizer and will need to me resized. This will send + // a WM_SIZE out which will be intercepted by the ScrollHelper + // which will cause the scrollbars to be displayed via the SetScrollbar + // call in CWindow. + // + if (IsKindOf(CLASSINFO(wxScrolledWindow))) + { + int nAdjustWidth = 0; + int nAdjustHeight = 0; + int nHSBHeight = wxSystemSettingsNative::GetMetric(wxSYS_HSCROLL_Y, + this); + int nVSBWidth = wxSystemSettingsNative::GetMetric(wxSYS_VSCROLL_X, + this); + SWP vSwpScroll; + + if (GetScrollBarHorz() == NULLHANDLE || + !WinIsWindowShowing(GetScrollBarHorz())) + nAdjustHeight = 0L; + else + nAdjustHeight = nHSBHeight; + if (GetScrollBarVert() == NULLHANDLE || + !WinIsWindowShowing(GetScrollBarVert())) + nAdjustWidth = 0L; + else + nAdjustWidth = nVSBWidth; + ::WinQueryWindowPos(hWnd, &vSwpScroll); + ::WinSetWindowPos( hWnd + ,HWND_TOP + ,vSwpScroll.x + ,vSwpScroll.y + nAdjustHeight + ,vSwpScroll.cx - nAdjustWidth + ,vSwpScroll.cy - nAdjustHeight + ,SWP_MOVE | SWP_SIZE + ); + } + ::WinQueryWindowPos(hWnd, &m_vWinSwp); } -} // end of wxWindow::DoMoveWindow +} // end of wxWindowOS2::DoMoveWindow // // Set the size of the window: if the dimensions are positive, just use them, @@ -1138,53 +1534,45 @@ void wxWindow::DoMoveWindow( // the width/height to best suit our contents, otherwise we reuse the current // width/height // -void wxWindow::DoSetSize( - int nX -, int nY -, int nWidth -, int nHeight -, int nSizeFlags -) +void wxWindowOS2::DoSetSize( int nX, + int nY, + int nWidth, + int nHeight, + int nSizeFlags ) { + // + // Input & output parameters assume wxWidgets coordinate system + // + // // Get the current size and position... // - int nCurrentX; - int nCurrentY; - int nCurrentWidth; - int nCurrentHeight; - wxSize vSize(-1, -1); - - GetPosition( &nCurrentX - ,&nCurrentY - ); - GetSize( &nCurrentWidth - ,&nCurrentHeight - ); + int nCurrentX; + int nCurrentY; + int nCurrentWidth; + int nCurrentHeight; + wxSize vSize = wxDefaultSize; + + GetPosition(&nCurrentX, &nCurrentY); + GetSize(&nCurrentWidth, &nCurrentHeight); // // ... and don't do anything (avoiding flicker) if it's already ok // - if ( nX == nCurrentX && - nY == nCurrentY && - nWidth == nCurrentWidth && - nHeight == nCurrentHeight - ) + if (nX == nCurrentX && nY == nCurrentY && + nWidth == nCurrentWidth && nHeight == nCurrentHeight) { return; } - if (nX == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (nX == wxDefaultCoord && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) nX = nCurrentX; - if (nY == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (nY == wxDefaultCoord && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) nY = nCurrentY; - AdjustForParentClientOrigin( nX - ,nY - ,nSizeFlags - ); + AdjustForParentClientOrigin(nX, nY, nSizeFlags); - if (nWidth == -1) + if (nWidth == wxDefaultCoord) { if (nSizeFlags & wxSIZE_AUTO_WIDTH) { @@ -1200,11 +1588,11 @@ void wxWindow::DoSetSize( } } - if (nHeight == -1) + if (nHeight == wxDefaultCoord) { if (nSizeFlags & wxSIZE_AUTO_HEIGHT) { - if (vSize.x == -1) + if (vSize.x == wxDefaultCoord) { vSize = DoGetBestSize(); } @@ -1217,120 +1605,49 @@ void wxWindow::DoSetSize( } } - DoMoveWindow( nX - ,nY - ,nWidth - ,nHeight - ); -} // end of wxWindow::DoSetSize + DoMoveWindow( nX, nY, nWidth, nHeight ); +} // end of wxWindowOS2::DoSetSize -void wxWindow::DoSetClientSize( - int nWidth -, int nHeight -) +void wxWindowOS2::DoSetClientSize( int nWidth, + int nHeight ) { - 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 + // nX & nY assume wxWidgets coordinate system // - POINTL vPoint; - - vPoint.x = vRect2.xLeft; - vPoint.y = vRect2.yBottom; - if (pParent) - { - vPoint.x -= vRect3.xLeft; - vPoint.y -= vRect3.yBottom; - } + int nX; + int nY; - DoMoveWindow( vPoint.x - ,vPoint.y - ,nActualWidth - ,nActualHeight - ); + GetPosition(&nX, &nY); - wxSizeEvent vEvent( wxSize( nWidth - ,nHeight - ) - ,m_windowId - ); + DoMoveWindow( nX, nY, nWidth, nHeight ); + wxSize size( nWidth, nHeight ); + wxSizeEvent vEvent( size, 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& rX -, int& rY -, int nSizeFlags -) -{ - // - // 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 + HandleWindowEvent(vEvent); +} // end of wxWindowOS2::DoSetClientSize // --------------------------------------------------------------------------- // text metrics // --------------------------------------------------------------------------- -int wxWindow::GetCharHeight() const +int wxWindowOS2::GetCharHeight() const { HPS hPs; FONTMETRICS vFontMetrics; - BOOL bRc; hPs = ::WinGetPS(GetHwnd()); if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics)) + { + ::WinReleasePS(hPs); return (0); - else - return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender); + } ::WinReleasePS(hPs); -} // end of wxWindow::GetCharHeight + return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender); +} // end of wxWindowOS2::GetCharHeight -int wxWindow::GetCharWidth() const +int wxWindowOS2::GetCharWidth() const { HPS hPs; FONTMETRICS vFontMetrics; @@ -1338,183 +1655,198 @@ int wxWindow::GetCharWidth() const hPs = ::WinGetPS(GetHwnd()); if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics)) + { + ::WinReleasePS(hPs); 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 + return(vFontMetrics.lAveCharWidth); +} // end of wxWindowOS2::GetCharWidth + +void wxWindowOS2::DoGetTextExtent( const wxString& rString, + int* pX, + int* pY, + int* pDescent, + int* pExternalLeading, + const wxFont* WXUNUSED(pTheFont) ) const { - 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()) + POINTL avPoint[TXTBOX_COUNT]; + POINTL vPtMin; + POINTL vPtMax; + int i; + int l; + FONTMETRICS vFM; // metrics structure + BOOL bRc = FALSE; + HPS hPS; + + hPS = ::WinGetPS(GetHwnd()); + + l = rString.length(); + if (l > 0L) + { + // + // In world coordinates. + // + bRc = ::GpiQueryTextBox( hPS, + l, + (char*) rString.wx_str(), + TXTBOX_COUNT,// return maximum information + avPoint // array of coordinates points + ); + if (bRc) + { + vPtMin.x = avPoint[0].x; + vPtMax.x = avPoint[0].x; + vPtMin.y = avPoint[0].y; + vPtMax.y = avPoint[0].y; + for (i = 1; i < 4; i++) + { + if(vPtMin.x > avPoint[i].x) vPtMin.x = avPoint[i].x; + if(vPtMin.y > avPoint[i].y) vPtMin.y = avPoint[i].y; + if(vPtMax.x < avPoint[i].x) vPtMax.x = avPoint[i].x; + if(vPtMax.y < avPoint[i].y) vPtMax.y = avPoint[i].y; + } + bRc = ::GpiQueryFontMetrics( hPS + ,sizeof(FONTMETRICS) + ,&vFM + ); + if (!bRc) + { + vPtMin.x = 0; + vPtMin.y = 0; + vPtMax.x = 0; + vPtMax.y = 0; + } + } + else + { + vPtMin.x = 0; + vPtMin.y = 0; + vPtMax.x = 0; + vPtMax.y = 0; + } + } + else { - ::GpiCreateLog - hFnt = (HFONT)((wxFont *)pFontToUse)->GetResourceHandle(); // const_cast - if (hFnt) - hFontOld = (HFONT)SelectObject(dc,fnt); + vPtMin.x = 0; + vPtMin.y = 0; + vPtMax.x = 0; + vPtMax.y = 0; } + if (pX) + *pX = (vPtMax.x - vPtMin.x + 1); + if (pY) + *pY = (vPtMax.y - vPtMin.y + 1); + if (pDescent) + { + if (bRc) + *pDescent = vFM.lMaxDescender; + else + *pDescent = 0; + } + if (pExternalLeading) + { + if (bRc) + *pExternalLeading = vFM.lExternalLeading; + else + *pExternalLeading = 0; + } + ::WinReleasePS(hPS); +} // end of wxWindow::DoGetTextExtent - 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 -// --------------------------------------------------------------------------- -// Caret manipulation -// --------------------------------------------------------------------------- - -void wxWindow::CreateCaret( - int nWidth -, int nHeight -) -{ - SetCaret(new wxCaret( this - ,nWidth - ,nHeight - )); -} // end of wxWindow::CreateCaret - -void wxWindow::CreateCaret( - const wxBitmap* pBitmap -) -{ - wxFAIL_MSG("not implemented"); -} // end of wxWindow::CreateCaret - -void wxWindow::ShowCaret( - bool bShow -) -{ - wxCHECK_RET( m_caret, "no caret to show" ); - - m_caret->Show(bShow); -} // end of wxWindow::ShowCaret - -void wxWindow::DestroyCaret() +bool wxWindowOS2::IsMouseInWindow() const { - SetCaret(NULL); -} // end of wxWindow::DestroyCaret + // + // Get the mouse position + POINTL vPt; -void wxWindow::SetCaretPos( - int nX -, int nY) -{ - wxCHECK_RET( m_caret, "no caret to move" ); + ::WinQueryPointerPos(HWND_DESKTOP, &vPt); - m_caret->Move( nX - ,nY - ); -} // end of wxWindow::SetCaretPos + // + // Find the window which currently has the cursor and go up the window + // chain until we find this window - or exhaust it + // + HWND hWnd = ::WinWindowFromPoint(HWND_DESKTOP, &vPt, TRUE); -void wxWindow::GetCaretPos( - int* pX -, int* pY -) const -{ - wxCHECK_RET( m_caret, "no caret to get position of" ); + while (hWnd && (hWnd != GetHwnd())) + hWnd = ::WinQueryWindow(hWnd, QW_PARENT); - m_caret->GetPosition( pX - ,pY - ); -} // end of wxWindow::GetCaretPos + return hWnd != NULL; +} // end of wxWindowOS2::IsMouseInWindow -#endif //wxUSE_CARET // --------------------------------------------------------------------------- // popup menu // --------------------------------------------------------------------------- - -bool wxWindow::DoPopupMenu( - wxMenu* pMenu -, int nX -, int nY -) +// +#if wxUSE_MENUS_NATIVE +bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY ) { - HWND hWnd = GetHwnd(); - HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0; - HWND hMenu = GetHmenuOf(pMenu); + HWND hWndOwner = GetHwnd(); + HWND hWndParent = GetHwnd(); + HWND hMenu = GetHmenuOf(pMenu); + bool bIsWaiting = true; + int nHeight; pMenu->SetInvokingWindow(this); pMenu->UpdateUI(); - DoClientToScreen( &nX - ,&nY - ); - wxCurrentPopupMenu = pMenu; + if ( nX == -1 && nY == -1 ) + { + wxPoint mouse = wxGetMousePosition(); + nX = mouse.x; nY = mouse.y; + } + else + { + DoClientToScreen( &nX + ,&nY + ); + DoGetSize(0,&nHeight); + nY = nHeight - nY; + } ::WinPopupMenu( hWndParent - ,hWnd + ,hWndOwner ,hMenu ,nX ,nY ,0L - ,PU_MOUSEBUTTON2DOWN | PU_MOUSEBUTTON2 | PU_KEYBOARD + ,PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_KEYBOARD ); - wxYield(); - wxCurrentPopupMenu = NULL; + + while(bIsWaiting) + { + QMSG vMsg; + + ::WinGetMsg(vHabmain,&vMsg, (HWND)0, 0, 0); + if (vMsg.msg == WM_COMMAND) + bIsWaiting = false; + ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg); + } pMenu->SetInvokingWindow(NULL); - return TRUE; -} // end of wxWindow::DoPopupMenu + return true; +} // end of wxWindowOS2::DoPopupMenu +#endif // wxUSE_MENUS_NATIVE // =========================================================================== // pre/post message processing // =========================================================================== -MRESULT wxWindow::OS2DefWindowProc( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) +MRESULT wxWindowOS2::OS2DefWindowProc( WXUINT uMsg, + WXWPARAM wParam, + WXLPARAM lParam ) { if (m_fnOldWndProc) - return (MRESULT)m_fnOldWndProc(GetHWND(), (ULONG)uMsg, (MPARAM)wParam, (MPARAM)lParam); + return (MRESULT)m_fnOldWndProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam); else - return ::WinDefWindowProc(GetHWND(), (ULONG)uMsg, (MPARAM)wParam, (MPARAM)lParam); -} // end of wxWindow::OS2DefWindowProc + return ::WinDefWindowProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam); +} // end of wxWindowOS2::OS2DefWindowProc -bool wxWindow::OS2ProcessMessage( - WXMSG* pMsg -) +bool wxWindowOS2::OS2ProcessMessage( WXMSG* pMsg ) { +// wxUniversal implements tab traversal itself +#ifndef __WXUNIVERSAL__ QMSG* pQMsg = (QMSG*)pMsg; if (m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL)) @@ -1522,17 +1854,17 @@ bool wxWindow::OS2ProcessMessage( // // Intercept dialog navigation keys // - bool bProcess = TRUE; - USHORT uKeyFlags = SHORT1FROMMP(pQMsg->mp1); + bool bProcess = true; + USHORT uKeyFlags = SHORT1FROMMP(pQMsg->mp1); if (uKeyFlags & KC_KEYUP) - bProcess = FALSE; + bProcess = false; if (uKeyFlags & KC_ALT) - bProcess = FALSE; + bProcess = false; if (!(uKeyFlags & KC_VIRTUALKEY)) - bProcess = FALSE; + bProcess = false; if (bProcess) { @@ -1551,8 +1883,8 @@ bool wxWindow::OS2ProcessMessage( ulDlgCode = (ULONG)::WinSendMsg(pQMsg->hwnd, WM_QUERYDLGCODE, pQMsg, 0); } - bool bForward = TRUE; - bool bWindowChange = FALSE; + bool bForward = true; + bool bWindowChange = false; switch (SHORT2FROMMP(pQMsg->mp2)) { @@ -1566,7 +1898,7 @@ bool wxWindow::OS2ProcessMessage( // if (!bShiftDown) { - bProcess = FALSE; + bProcess = false; } else { @@ -1577,11 +1909,11 @@ bool wxWindow::OS2ProcessMessage( { case DLGC_ENTRYFIELD: case DLGC_MLE: - bProcess = TRUE; + bProcess = true; break; default: - bProcess = FALSE; + bProcess = false; } // @@ -1595,15 +1927,15 @@ bool wxWindow::OS2ProcessMessage( case VK_UP: case VK_LEFT: if (bCtrlDown) - bProcess = FALSE; + bProcess = false; else - bForward = FALSE; + bForward = false; break; case VK_DOWN: case VK_RIGHT: if (bCtrlDown) - bProcess = FALSE; + bProcess = false; break; case VK_ENTER: @@ -1613,27 +1945,23 @@ bool wxWindow::OS2ProcessMessage( // // ctrl-enter is not processed // - return FALSE; + return false; } else if (ulDlgCode & DLGC_BUTTON) { // // buttons want process Enter themselevs // - bProcess = FALSE; + bProcess = false; } else { - wxPanel* pPanel = wxDynamicCast(this, wxPanel); + wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); wxButton* pBtn = NULL; - if (pPanel) + if (tlw) { - // - // Panel may have a default button which should - // be activated by Enter - // - pBtn = pPanel->GetDefaultItem(); + pBtn = wxDynamicCast(tlw->GetDefaultItem(), wxButton); } if (pBtn && pBtn->IsEnabled()) @@ -1642,7 +1970,15 @@ bool wxWindow::OS2ProcessMessage( // If we do have a default button, do press it // pBtn->OS2Command(BN_CLICKED, 0 /* unused */); - return TRUE; + 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. @@ -1652,7 +1988,7 @@ bool wxWindow::OS2ProcessMessage( break; default: - bProcess = FALSE; + bProcess = false; } if (bProcess) @@ -1663,7 +1999,7 @@ bool wxWindow::OS2ProcessMessage( vEvent.SetWindowChange(bWindowChange); vEvent.SetEventObject(this); - if (GetEventHandler()->ProcessEvent(vEvent)) + if (HandleWindowEvent(vEvent)) { wxButton* pBtn = wxDynamicCast(FindFocus(), wxButton); @@ -1674,7 +2010,7 @@ bool wxWindow::OS2ProcessMessage( // pBtn->SetDefault(); } - return TRUE; + return true; } } } @@ -1682,35 +2018,36 @@ bool wxWindow::OS2ProcessMessage( // Let Dialogs process // if (::WinSendMsg(pQMsg->hwnd, WM_QUERYDLGCODE, pQMsg, 0)); - return TRUE; - } - -#if wxUSE_TOOLTIPS - if ( m_tooltip ) - { - // relay mouse move events to the tooltip control - QMSG* pQMsg = (QMSG*)pMsg; - - if (pQMsg->msg == WM_MOUSEMOVE ) - m_tooltip->RelayEvent(pMsg); + return true; } -#endif // wxUSE_TOOLTIPS +#else + pMsg = pMsg; // just shut up the compiler +#endif // __WXUNIVERSAL__ - return FALSE; -} // end of wxWindow::OS2ProcessMessage + return false; +} // end of wxWindowOS2::OS2ProcessMessage -bool wxWindow::OS2TranslateMessage( - WXMSG* pMsg -) +bool wxWindowOS2::OS2TranslateMessage( WXMSG* pMsg ) { +#if wxUSE_ACCEL && !defined(__WXUNIVERSAL__) return m_acceleratorTable.Translate(m_hWnd, pMsg); -} // end of wxWindow::OS2TranslateMessage +#else + pMsg = pMsg; + return false; +#endif //wxUSE_ACCEL +} // end of wxWindowOS2::OS2TranslateMessage + +bool wxWindowOS2::OS2ShouldPreProcessMessage( WXMSG* WXUNUSED(pMsg) ) +{ + // preprocess all messages by default + return true; +} // end of wxWindowOS2::OS2ShouldPreProcessMessage // --------------------------------------------------------------------------- // message params unpackers // --------------------------------------------------------------------------- -void wxWindow::UnpackCommand( +void wxWindowOS2::UnpackCommand( WXWPARAM wParam , WXLPARAM lParam , WORD* pId @@ -1719,11 +2056,11 @@ void wxWindow::UnpackCommand( ) { *pId = LOWORD(wParam); - *phWnd = (WXHWND)lParam; - *pCmd = HIWORD(wParam); -} // end of wxWindow::UnpackCommand + *phWnd = NULL; // or may be GetHWND() ? + *pCmd = LOWORD(lParam); +} // end of wxWindowOS2::UnpackCommand -void wxWindow::UnpackActivate( +void wxWindowOS2::UnpackActivate( WXWPARAM wParam , WXLPARAM lParam , WXWORD* pState @@ -1732,9 +2069,9 @@ void wxWindow::UnpackActivate( { *pState = LOWORD(wParam); *phWnd = (WXHWND)lParam; -} // end of wxWindow::UnpackActivate +} // end of wxWindowOS2::UnpackActivate -void wxWindow::UnpackScroll( +void wxWindowOS2::UnpackScroll( WXWPARAM wParam , WXLPARAM lParam , WXWORD* pCode @@ -1742,12 +2079,21 @@ void wxWindow::UnpackScroll( , WXHWND* phWnd ) { - *pCode = LOWORD(wParam); - *pPos = HIWORD(wParam); - *phWnd = (WXHWND)lParam; -} // end of wxWindow::UnpackScroll + ULONG ulId; + HWND hWnd; -void wxWindow::UnpackMenuSelect( + ulId = (ULONG)LONGFROMMP(wParam); + hWnd = ::WinWindowFromID(GetHwnd(), ulId); + if (hWnd == m_hWndScrollBarHorz || hWnd == m_hWndScrollBarVert) + *phWnd = NULLHANDLE; + else + *phWnd = hWnd; + + *pPos = SHORT1FROMMP(lParam); + *pCode = SHORT2FROMMP(lParam); +} // end of wxWindowOS2::UnpackScroll + +void wxWindowOS2::UnpackMenuSelect( WXWPARAM wParam , WXLPARAM lParam , WXWORD* pItem @@ -1758,17 +2104,17 @@ void wxWindow::UnpackMenuSelect( *pItem = (WXWORD)LOWORD(wParam); *pFlags = HIWORD(wParam); *phMenu = (WXHMENU)lParam; -} // end of wxWindow::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 // --------------------------------------------------------------------------- // // Hook for new window just as it's being created, when the window isn't yet // associated with the handle // -wxWindow* wxWndHook = NULL; +wxWindowOS2* wxWndHook = NULL; // // Main window proc @@ -1780,15 +2126,7 @@ 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__ - - wxWindow* pWnd = wxFindWinFromHandle((WXHWND)hWnd); + wxWindowOS2* pWnd = wxFindWinFromHandle((WXHWND)hWnd); // // When we get the first message for the HWND we just created, we associate @@ -1802,7 +2140,7 @@ MRESULT EXPENTRY wxWndProc( pWnd->SetHWND((WXHWND)hWnd); } - MRESULT rc = (MRESULT)FALSE; + MRESULT rc = (MRESULT)0; // @@ -1817,10 +2155,22 @@ MRESULT EXPENTRY wxWndProc( else { if (pWnd) + { rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam); + if ( (pWnd->GetScrollBarHorz() != NULLHANDLE || + pWnd->GetScrollBarVert() != NULLHANDLE) && + ulMsg == WM_PAINT) + { + if (pWnd->GetScrollBarHorz() != NULLHANDLE) + ::WinInvalidateRect(pWnd->GetScrollBarHorz(), NULL, TRUE); + if (pWnd->GetScrollBarVert() != NULLHANDLE) + ::WinInvalidateRect(pWnd->GetScrollBarVert(), NULL, TRUE); + } + } else rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); } + return rc; } // end of wxWndProc @@ -1828,31 +2178,15 @@ MRESULT EXPENTRY wxWndProc( // We will add (or delete) messages we need to handle at this default // level as we go // -MRESULT wxWindow::OS2WindowProc( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) +MRESULT wxWindowOS2::OS2WindowProc( WXUINT uMsg, + WXWPARAM wParam, + WXLPARAM lParam ) { // // Did we process the uMsg? // - bool bProcessed = FALSE; - bool bAllow; - MRESULT mResult; - WXHICON hIcon; - WXHBRUSH hBrush; - - // - // The return value - // -// union -// { -// bool bAllow; -// MRESULT mResult; -// WXHICON hIcon; -// WXHBRUSH hBrush; -// } vRc; + bool bProcessed = false; + MRESULT mResult; // // For most messages we should return 0 when we do process the message @@ -1880,8 +2214,7 @@ MRESULT wxWindow::OS2WindowProc( case WM_DESTROY: HandleDestroy(); - bProcessed = TRUE; -// delete this; + bProcessed = true; break; case WM_MOVE: @@ -1897,6 +2230,44 @@ MRESULT wxWindow::OS2WindowProc( ); break; + case WM_WINDOWPOSCHANGED: + + // + // Dialogs under OS/2 do not get WM_SIZE events at all. + // Instead they get this, which can function much like WM_SIZE + // PSWP contains the new sizes and positioning, PSWP+1 the old + // We use this because ADJUSTWINDOWPOS comes BEFORE the new + // position is added and our auto layout does a WinQueryWindowRect + // to get the CURRENT client size. That is the size used to position + // child controls, so we need to already be sized + // in order to get the child controls positoned properly. + // + if (IsKindOf(CLASSINFO(wxDialog)) || IsKindOf(CLASSINFO(wxFrame))) + { + PSWP pSwp = (PSWP)PVOIDFROMMP(wParam); + PSWP pSwp2 = pSwp++; + + if (!(pSwp->cx == pSwp2->cx && + pSwp->cy == pSwp2->cy)) + bProcessed = HandleSize( pSwp->cx + ,pSwp->cy + ,(WXUINT)lParam + ); + if (IsKindOf(CLASSINFO(wxFrame))) + { + wxFrame* pFrame = wxDynamicCast(this, wxFrame); + + if (pFrame) + { + if (pFrame->GetStatusBar()) + pFrame->PositionStatusBar(); + if (pFrame->GetToolBar()) + pFrame->PositionToolBar(); + } + } + } + break; + case WM_ACTIVATE: { WXWORD wState; @@ -1911,7 +2282,7 @@ MRESULT wxWindow::OS2WindowProc( bProcessed = HandleActivate( wState ,(WXHWND)hWnd ); - bProcessed = FALSE; + bProcessed = false; } break; @@ -1931,7 +2302,7 @@ MRESULT wxWindow::OS2WindowProc( // Don't let the DefWindowProc() destroy our window - we'll do it // ourselves in ~wxWindow // - bProcessed = TRUE; + bProcessed = true; mResult = (MRESULT)TRUE; break; @@ -1960,12 +2331,40 @@ MRESULT wxWindow::OS2WindowProc( case WM_BUTTON3MOTIONEND: case WM_BUTTON3MOTIONSTART: { - short x = LOWORD(lParam); - short y = HIWORD(lParam); + short nX = LOWORD(wParam); + short nY = HIWORD(wParam); - bProcessed = HandleMouseEvent(uMsg, x, y, (WXUINT)wParam); + // + // Redirect the event to a static control if necessary + // + if (this == GetCapture()) + { + bProcessed = HandleMouseEvent( uMsg + ,nX + ,nY + ,(WXUINT)SHORT2FROMMP(lParam) + ); + } + else + { + wxWindow* pWin = FindWindowForMouseEvent( this + ,&nX + ,&nY + ); + if (!pWin->IsOfStandardClass()) + { + if (uMsg == WM_BUTTON1DOWN && pWin->CanAcceptFocus() ) + pWin->SetFocus(); + } + bProcessed = pWin->HandleMouseEvent( uMsg + ,nX + ,nY + ,(WXUINT)SHORT2FROMMP(lParam) + ); + } } break; + case WM_SYSCOMMAND: bProcessed = HandleSysCommand(wParam, lParam); break; @@ -1986,16 +2385,18 @@ MRESULT wxWindow::OS2WindowProc( case WM_DRAWITEM: case WM_MEASUREITEM: { - int idCtrl = (UINT)wParam; + int nIdCtrl = (UINT)wParam; + if ( uMsg == WM_DRAWITEM ) { - bProcessed = OS2OnDrawItem(idCtrl, + bProcessed = OS2OnDrawItem(nIdCtrl, (WXDRAWITEMSTRUCT *)lParam); } else { - bProcessed = OS2OnMeasureItem(idCtrl, - (WXMEASUREITEMSTRUCT *)lParam); + return MRFROMLONG(OS2OnMeasureItem( nIdCtrl + ,(WXMEASUREITEMSTRUCT *)lParam + )); } if ( bProcessed ) @@ -2004,10 +2405,13 @@ MRESULT wxWindow::OS2WindowProc( break; case WM_QUERYDLGCODE: - if ( m_lDlgCode ) + if (!IsOfStandardClass()) { - mResult = (MRESULT)m_lDlgCode; - bProcessed = TRUE; + if ( m_lDlgCode ) + { + mResult = (MRESULT)m_lDlgCode; + bProcessed = true; + } } // //else: get the dlg code from the DefWindowProc() @@ -2024,17 +2428,19 @@ MRESULT wxWindow::OS2WindowProc( if (uKeyFlags & KC_KEYUP) { - bProcessed = HandleKeyUp((WXDWORD)wParam, lParam); + //TODO: check if the cast to WXWORD isn't causing trouble + bProcessed = HandleKeyUp(wParam, lParam); break; } else // keydown event { + m_bLastKeydownProcessed = false; // // If this has been processed by an event handler, // return 0 now (we've handled it). DON't RETURN // we still need to process further // - HandleKeyDown((WXDWORD)wParam, lParam); + m_bLastKeydownProcessed = HandleKeyDown(wParam, lParam); if (uKeyFlags & KC_VIRTUALKEY) { USHORT uVk = SHORT2FROMMP((MPARAM)lParam); @@ -2042,40 +2448,51 @@ MRESULT wxWindow::OS2WindowProc( // // We consider these message "not interesting" to OnChar // - if (uVk == VK_SHIFT || uVk == VK_CTRL ) - { - bProcessed = TRUE; - break; - } switch(uVk) { - // + case VK_SHIFT: + case VK_CTRL: + case VK_MENU: + case VK_CAPSLOCK: + case VK_NUMLOCK: + case VK_SCRLLOCK: + bProcessed = true; + break; + // 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: - // But set processed to FALSE, not TRUE to still pass them to + // But set processed to false, not true to still pass them to // the control's default window proc - otherwise built-in // keyboard handling won't work - bProcessed = FALSE; + bProcessed = false; break; - case VK_LEFT: - case VK_RIGHT: - case VK_DOWN: - case VK_UP: default: - bProcessed = HandleChar((WXDWORD)wParam, lParam); + bProcessed = HandleChar(wParam, lParam); } break; } else // WM_CHAR -- Always an ASCII character { - bProcessed = HandleChar((WXDWORD)wParam, lParam, TRUE); - break; + if (m_bLastKeydownProcessed) + { + // + // The key was handled in the EVT_KEY_DOWN and handling + // a key in an EVT_KEY_DOWN handler is meant, by + // design, to prevent EVT_CHARs from happening + // + m_bLastKeydownProcessed = false; + bProcessed = true; + } + else // do generate a CHAR event + { + bProcessed = HandleChar(wParam, lParam, true); + break; + } } } } @@ -2102,6 +2519,213 @@ MRESULT wxWindow::OS2WindowProc( } break; + 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); + wxBookCtrlEvent 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 CBN_LBSELECT: + 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) + ,(WXWORD)SHORT1FROMMP(wParam) + ); + } + if (pWin->IsKindOf(CLASSINFO(wxRadioButton))) + { + wxRadioButton* pRadioButton = wxDynamicCast(pWin, wxRadioButton); + + pRadioButton->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXWORD)SHORT1FROMMP(wParam) + ); + } + if (pWin->IsKindOf(CLASSINFO(wxCheckBox))) + { + wxCheckBox* pCheckBox = wxDynamicCast(pWin, wxCheckBox); + + pCheckBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXWORD)SHORT1FROMMP(wParam) + ); + } + if (pWin->IsKindOf(CLASSINFO(wxListBox))) + { + wxListBox* pListBox = wxDynamicCast(pWin, wxListBox); + + pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXWORD)SHORT1FROMMP(wParam) + ); + if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW) + Refresh(); + } + if (pWin->IsKindOf(CLASSINFO(wxComboBox))) + { + wxComboBox* pComboBox = wxDynamicCast(pWin, wxComboBox); + + pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXWORD)SHORT1FROMMP(wParam) + ); + } + if (pWin->IsKindOf(CLASSINFO(wxChoice))) + { + wxChoice* pChoice = wxDynamicCast(pWin, wxChoice); + + pChoice->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXWORD)SHORT1FROMMP(wParam) + ); + } + return 0; + } + // break; + + case LN_ENTER: + { + 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) + ,(WXWORD)SHORT1FROMMP(wParam) + ); + if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW) + Refresh(); + + } + if (pWin->IsKindOf(CLASSINFO(wxComboBox))) + { + wxComboBox* pComboBox = wxDynamicCast(pWin, wxComboBox); + + pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) + ,(WXWORD)SHORT1FROMMP(wParam) + ); + } + return 0; + } + // break; + + case SPBN_UPARROW: + case SPBN_DOWNARROW: + case SPBN_CHANGE: + { + char zVal[10]; + long lVal; + + ::WinSendMsg( HWNDFROMMP(lParam) + ,SPBM_QUERYVALUE + ,&zVal[0] + ,MPFROM2SHORT( (USHORT)10 + ,(USHORT)SPBQ_UPDATEIFVALID + ) + ); + lVal = atol(zVal); + bProcessed = OS2OnScroll( wxVERTICAL + ,(WXWORD)SHORT2FROMMP(wParam) + ,(WXWORD)lVal + ,HWNDFROMMP(lParam) + ); + } + break; + + case SLN_SLIDERTRACK: + { + HWND hWnd = ::WinWindowFromID(GetHWND(), SHORT1FROMMP(wParam)); + wxWindowOS2* pChild = wxFindWinFromHandle(hWnd); + + if (!pChild) + { + bProcessed = false; + break; + } + if (pChild->IsKindOf(CLASSINFO(wxSlider))) + bProcessed = OS2OnScroll( wxVERTICAL + ,(WXWORD)SHORT2FROMMP(wParam) + ,(WXWORD)LONGFROMMP(lParam) + ,hWnd + ); + } + break; + } + break; + #if defined(__VISAGECPP__) && (__IBMCPP__ >= 400) case WM_CTLCOLORCHANGE: { @@ -2109,18 +2733,13 @@ MRESULT wxWindow::OS2WindowProc( } break; #endif - // - // Instead of CTLCOLOR messages PM sends QUERYWINDOWPARAMS to - // things such as colors and fonts and such - // - case WM_QUERYWINDOWPARAMS: - { - PWNDPARAMS pWndParams = (PWNDPARAMS)wParam; - - bProcessed = HandleWindowParams( pWndParams - ,lParam - ); - } + case WM_ERASEBACKGROUND: + // + // Returning TRUE to requestw PM to paint the window background + // in SYSCLR_WINDOW. We don't really want that + // + bProcessed = HandleEraseBkgnd((WXHDC)(HPS)wParam); + mResult = (MRESULT)(FALSE); break; // the return value for this message is ignored @@ -2132,22 +2751,6 @@ MRESULT wxWindow::OS2WindowProc( bProcessed = HandlePaletteChanged(); break; - case WM_PRESPARAMCHANGED: - bProcessed = HandlePresParamChanged(wParam); - break; - - // move this to wxFrame - case WM_ERASEBACKGROUND: - bProcessed = HandleEraseBkgnd((WXHDC)(HDC)wParam); - if (bProcessed) - { - // - // We processed the message, i.e. erased the background - // - mResult = (MRESULT)TRUE; - } - break; - // move all drag and drops to wxDrg case WM_ENDDRAG: bProcessed = HandleEndDrag(wParam); @@ -2159,7 +2762,7 @@ MRESULT wxWindow::OS2WindowProc( if ( bProcessed ) { // we never set focus from here - mResult = FALSE; + mResult = (MRESULT)FALSE; } break; @@ -2190,60 +2793,53 @@ MRESULT wxWindow::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) { #ifdef __WXDEBUG__ wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."), wxGetMessageName(uMsg)); #endif // __WXDEBUG__ - mResult = OS2DefWindowProc(uMsg, wParam, lParam); + if (IsKindOf(CLASSINFO(wxFrame))) + mResult = ::WinDefWindowProc(m_hWnd, uMsg, wParam, lParam); + else if (IsKindOf(CLASSINFO(wxDialog))) + mResult = ::WinDefDlgProc( m_hWnd, uMsg, wParam, lParam); + else + mResult = OS2DefWindowProc(uMsg, wParam, lParam); } return mResult; -} // end of wxWindow::OS2WindowProc +} // end of wxWindowOS2::OS2WindowProc -// -// Dialog window proc -// -MRESULT wxDlgProc( - HWND hWnd -, UINT uMsg -, MPARAM wParam -, MPARAM 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 +// ---------------------------------------------------------------------------- +// 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( HWND hWnd -, wxWindow* pWin +, wxWindowOS2* pWin ) { // @@ -2253,187 +2849,168 @@ void wxAssociateWinWithHandle( wxCHECK_RET( hWnd != (HWND)NULL, wxT("attempt to add a NULL hWnd to window list ignored") ); - wxWindow* pOldWin = wxFindWinFromHandle((WXHWND) hWnd); if (pOldWin && (pOldWin != pWin)) { - wxString str(pWin->GetClassInfo()->GetClassName()); - wxLogError( "Bug! Found existing HWND %X for new window of class %s" - ,(int)hWnd - ,(const char*)str + wxString Newstr(pWin->GetClassInfo()->GetClassName()); + wxString Oldstr(pOldWin->GetClassInfo()->GetClassName()); + wxLogError( wxT("Bug! New window of class %s has same HWND %X as old window of class %s"), + Newstr.c_str(), + (int)hWnd, + Oldstr.c_str() ); } else if (!pOldWin) { - wxWinHandleList->Append( (long)hWnd - ,pWin - ); + wxWinHandleHash->Put( (long)hWnd + ,(wxWindow *)pWin + ); } } // end of wxAssociateWinWithHandle -void wxRemoveHandleAssociation( - wxWindow* pWin -) +void wxRemoveHandleAssociation( wxWindowOS2* pWin ) { - wxWinHandleList->DeleteObject(pWin); + wxWinHandleHash->Delete((long)pWin->GetHWND()); } // end of wxRemoveHandleAssociation // // Default destroyer - override if you destroy it in some other way // (e.g. with MDI child windows) // -void wxWindow::OS2DestroyWindow() +void wxWindowOS2::OS2DestroyWindow() { } -void wxWindow::OS2DetachWindowMenu() +bool wxWindowOS2::OS2GetCreateWindowCoords( const wxPoint& rPos, + const wxSize& rSize, + int& rnX, + int& rnY, + int& rnWidth, + int& rnHeight ) const { - if (m_hMenu) + bool bNonDefault = false; + static const int DEFAULT_Y = 200; + static const int DEFAULT_H = 250; + + if (rPos.x == wxDefaultCoord) + { + rnX = rnY = CW_USEDEFAULT; + } + else + { + rnX = rPos.x; + rnY = rPos.y == wxDefaultCoord ? DEFAULT_Y : rPos.y; + bNonDefault = true; + } + if (rSize.x == wxDefaultCoord) { - HMENU hMenu = (HMENU)m_hMenu; + rnWidth = rnHeight = CW_USEDEFAULT; + } + else + { + rnWidth = rSize.x; + rnHeight = rSize.y == wxDefaultCoord ? DEFAULT_H : rSize.y; + bNonDefault = true; + } + return bNonDefault; +} // end of wxWindowOS2::OS2GetCreateWindowCoords - int nN = (int)::WinSendMsg(hMenu, MM_QUERYITEMCOUNT, 0, 0); - int i; +WXHWND wxWindowOS2::OS2GetParent() const +{ + return m_parent ? m_parent->GetHWND() : NULL; +} - for (i = 0; i < nN; i++) - { - wxChar zBuf[100]; - int nChars = (int)::WinSendMsg( hMenu - ,MM_QUERYITEMTEXT - ,MPFROM2SHORT(i, nN) - ,zBuf - ); - if (!nChars) - { - wxLogLastError(wxT("GetMenuString")); - continue; - } +bool wxWindowOS2::OS2Create( PSZ zClass, + const wxChar* zTitle, + WXDWORD dwStyle, + const wxPoint& rPos, + const wxSize& rSize, + void* pCtlData, + WXDWORD WXUNUSED(dwExStyle), + bool bIsChild ) +{ + ERRORID vError; + wxString sError; + int nX = 0L; + int nY = 0L; + int nWidth = 0L; + int nHeight = 0L; + long lControlId = 0L; + wxWindowCreationHook vHook(this); + wxString sClassName((wxChar*)zClass); + wxString sTitle(zTitle ? zTitle : wxEmptyString); + + OS2GetCreateWindowCoords( rPos + ,rSize + ,nX + ,nY + ,nWidth + ,nHeight + ); - if (wxStrcmp(zBuf, wxT("&Window")) == 0) - { - ::WinSendMsg(hMenu, MM_DELETEITEM, MPFROM2SHORT(i, TRUE), 0); - break; - } + if (bIsChild) + { + lControlId = GetId(); + if (GetWindowStyleFlag() & wxCLIP_SIBLINGS) + { + dwStyle |= WS_CLIPSIBLINGS; } } -} // end of wxWindow::OS2DetachWindowMenu - -bool wxWindow::OS2Create( - WXHWND hParent -, PSZ zClass -, const wxChar* zTitle -, WXDWORD dwStyle -, long lX -, long lY -, long lWidth -, long lHeight -, WXHWND hOwner -, WXHWND hZOrder -, unsigned long ulId -, void* pCtlData -, void* pPresParams -) -{ - ERRORID vError; - wxString sError; - long lX1 = (long)CW_USEDEFAULT; - long lY1 = 0L; - long lWidth1 = (long)CW_USEDEFAULT; - long lHeight1 = 100L; - int nControlId = 0; - // - // Find parent's size, if it exists, to set up a possible default - // panel size the size of the parent window + // For each class "Foo" we have we also have "FooNR" ("no repaint") class + // 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 // - RECTL vParentRect; - HWND hWndClient; - - if (lX > -1L) - lX1 = lX; - if (lY > -1L) - lY1 = lY; - if (lWidth > -1L) - lWidth1 = lWidth; - if (lHeight > -1L) - lHeight1 = lHeight; - - wxWndHook = this; - - // - // check to see if the new window is a standard control - // - if ((ULONG)zClass == (ULONG)WC_BUTTON || - (ULONG)zClass == (ULONG)WC_COMBOBOX || - (ULONG)zClass == (ULONG)WC_CONTAINER || - (ULONG)zClass == (ULONG)WC_ENTRYFIELD || - (ULONG)zClass == (ULONG)WC_FRAME || - (ULONG)zClass == (ULONG)WC_LISTBOX || - (ULONG)zClass == (ULONG)WC_MENU || - (ULONG)zClass == (ULONG)WC_NOTEBOOK || - (ULONG)zClass == (ULONG)WC_SCROLLBAR || - (ULONG)zClass == (ULONG)WC_SPINBUTTON || - (ULONG)zClass == (ULONG)WC_STATIC || - (ULONG)zClass == (ULONG)WC_TITLEBAR || - (ULONG)zClass == (ULONG)WC_VALUESET - ) + if (!HasFlag(wxFULL_REPAINT_ON_RESIZE)) { - nControlId = ulId; + sClassName += wxT("NR"); } - - // - // We will either have a registered class via string name or a standard PM Class via a long - // - m_hWnd = (WXHWND)::WinCreateWindow( (HWND)hParent - ,zClass - ,(PSZ)zTitle ? zTitle : wxT("") + m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent() + ,sClassName.c_str() + ,sTitle.c_str() ,(ULONG)dwStyle - ,(LONG)lX1 - ,(LONG)lY1 - ,(LONG)lWidth - ,(LONG)lHeight + ,(LONG)0L + ,(LONG)0L + ,(LONG)0L + ,(LONG)0L ,NULLHANDLE ,HWND_TOP - ,(ULONG)ulId + ,(ULONG)lControlId ,pCtlData - ,pPresParams + ,NULL ); if (!m_hWnd) { - vError = ::WinGetLastError(vHabmain); + vError = ::WinGetLastError(wxGetInstance()); sError = wxPMErrorToStr(vError); - wxLogError("Can't create window of class %s!. Error: %s\n", zClass, sError); - return FALSE; + return false; } - ::WinSetWindowULong(m_hWnd, QWL_USER, (ULONG) this); - wxWndHook = NULL; + SubclassWin(m_hWnd); + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); -#ifdef __WXDEBUG__ - wxNode* pNode = wxWinHandleList->Member(this); - - if (pNode) - { - HWND hWnd = (HWND)pNode->GetKeyInteger(); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - if (hWnd != (HWND)m_hWnd) + LONG lColor = (LONG)m_backgroundColour.GetPixel(); - { - wxLogError("A second HWND association is being added for the same window!"); - } + if (!::WinSetPresParam( m_hWnd + ,PP_BACKGROUNDCOLOR + ,sizeof(LONG) + ,(PVOID)&lColor + )) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError(wxT("Error creating frame. Error: %s\n"), sError.c_str()); + return false; } -#endif - wxAssociateWinWithHandle((HWND)m_hWnd - ,this - ); - // - // Now need to subclass window. - // - - SubclassWin(GetHWND()); - - return TRUE; -} // end of wxWindow::OS2Create + SetSize( nX + ,nY + ,nWidth + ,nHeight + ); + return true; +} // end of wxWindowOS2::OS2Create // =========================================================================== // OS2 PM message handlers @@ -2443,23 +3020,21 @@ bool wxWindow::OS2Create( // window creation/destruction // --------------------------------------------------------------------------- -bool wxWindow::HandleCreate( - WXLPCREATESTRUCT vCs -, bool* pbMayCreate -) +bool wxWindowOS2::HandleCreate( WXLPCREATESTRUCT WXUNUSED(vCs), + bool* pbMayCreate ) { - wxWindowCreateEvent vEvent(this); + wxWindowCreateEvent vEvent((wxWindow*)this); - (void)GetEventHandler()->ProcessEvent(vEvent); - *pbMayCreate = TRUE; - return TRUE; -} // end of wxWindow::HandleCreate + (void)HandleWindowEvent(vEvent); + *pbMayCreate = true; + return true; +} // end of wxWindowOS2::HandleCreate -bool wxWindow::HandleDestroy() +bool wxWindowOS2::HandleDestroy() { - wxWindowDestroyEvent vEvent(this); - - (void)GetEventHandler()->ProcessEvent(vEvent); + wxWindowDestroyEvent vEvent((wxWindow*)this); + vEvent.SetId(GetId()); + (void)HandleWindowEvent(vEvent); // // Delete our drop target if we've got one @@ -2467,7 +3042,6 @@ bool wxWindow::HandleDestroy() #if wxUSE_DRAG_AND_DROP if (m_dropTarget != NULL) { - m_dropTarget->Revoke(m_hWnd); delete m_dropTarget; m_dropTarget = NULL; } @@ -2476,46 +3050,20 @@ bool wxWindow::HandleDestroy() // // WM_DESTROY handled // - return TRUE; -} // end of wxWindow::HandleDestroy + return true; +} // end of wxWindowOS2::HandleDestroy // --------------------------------------------------------------------------- // activation/focus // --------------------------------------------------------------------------- -void wxWindow::OnSetFocus( +void wxWindowOS2::OnSetFocus( wxFocusEvent& rEvent ) { - // - // Panel wants to track the window which was the last to have focus in it, - // so we want to set ourselves as the window which last had focus - // - // Notice that it's also important to do it upwards the tree becaus - // otherwise when the top level panel gets focus, it won't set it back to - // us, but to some other sibling - // - wxWindow* pWin = this; - - while (pWin) - { - wxWindow* pParent = pWin->GetParent(); - wxPanel* pPanel = wxDynamicCast( pParent - ,wxPanel - ); - if (pPanel) - { - pPanel->SetLastFocus(pWin); - } - pWin = pParent; - } - - wxLogTrace(_T("focus"), _T("%s (0x%08x) gets focus"), - GetClassInfo()->GetClassName(), GetHandle()); - rEvent.Skip(); -} // end of wxWindow::OnSetFocus +} // end of wxWindowOS2::OnSetFocus -bool wxWindow::HandleActivate( +bool wxWindowOS2::HandleActivate( int nState , WXHWND WXUNUSED(hActivate) ) @@ -2525,13 +3073,18 @@ bool wxWindow::HandleActivate( ,m_windowId ); vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleActivate + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleActivate -bool wxWindow::HandleSetFocus( - WXHWND WXUNUSED(hWnd) -) +bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) ) { + // + // Notify the parent keeping track of focus for the kbd navigation + // purposes that we got it + // + wxChildFocusEvent vEventFocus((wxWindow *)this); + (void)HandleWindowEvent(vEventFocus); + #if wxUSE_CARET // // Deal with caret @@ -2542,26 +3095,22 @@ bool wxWindow::HandleSetFocus( } #endif // wxUSE_CARET - // - // Panel wants to track the window which was the last to have focus in it - // - wxPanel* pPanel = wxDynamicCast( GetParent() - ,wxPanel - ); - if (pPanel) +#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 from EN_FOCUS handler + if ( wxDynamicCastThis(wxTextCtrl) ) { - pPanel->SetLastFocus(this); + return false; } +#endif // wxUSE_TEXTCTRL wxFocusEvent vEvent(wxEVT_SET_FOCUS, m_windowId); vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleSetFocus + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleSetFocus -bool wxWindow::HandleKillFocus( - WXHWND WXUNUSED(hWnd) -) +bool wxWindowOS2::HandleKillFocus( WXHWND hWnd ) { #if wxUSE_CARET // @@ -2573,140 +3122,288 @@ bool wxWindow::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); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleKillFocus + + // + // wxFindWinFromHandle() may return NULL, it is ok + // + vEvent.SetWindow(wxFindWinFromHandle(hWnd)); + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleKillFocus // --------------------------------------------------------------------------- // miscellaneous // --------------------------------------------------------------------------- -bool wxWindow::HandleShow( +bool wxWindowOS2::HandleShow( bool bShow -, int nStatus +, int WXUNUSED(nStatus) ) { - wxShowEvent vEvent( GetId() - ,bShow - ); + wxShowEvent vEvent(GetId(), bShow); - vEvent.m_eventObject = this; - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleShow + vEvent.SetEventObject(this); + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleShow -bool wxWindow::HandleInitDialog( - WXHWND WXUNUSED(hWndFocus) -) +bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) ) { wxInitDialogEvent vEvent(GetId()); - vEvent.m_eventObject = this; - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleInitDialog + vEvent.SetEventObject(this); + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleInitDialog -bool wxWindow::HandleEndDrag(WXWPARAM wParam) +bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam)) { // TODO: We'll handle drag and drop later - return FALSE; + return false; } -bool wxWindow::HandleSetCursor( - USHORT vId -, WXHWND hPointer -) +bool wxWindowOS2::HandleSetCursor( USHORT WXUNUSED(vId), + WXHWND hPointer ) { // // Under OS/2 PM this allows the pointer to be changed // as it passes over a control // ::WinSetPointer(HWND_DESKTOP, (HPOINTER)hPointer); - return TRUE; -} // end of wxWindow::HandleSetCursor + return true; +} // end of wxWindowOS2::HandleSetCursor // --------------------------------------------------------------------------- // owner drawn stuff // --------------------------------------------------------------------------- -bool wxWindow::OS2OnDrawItem( - int vId -, WXDRAWITEMSTRUCT* pItemStruct -) +bool wxWindowOS2::OS2OnDrawItem( int vId, + WXDRAWITEMSTRUCT* pItemStruct ) { - // - // I'll get to owner drawn stuff later - // +#if wxUSE_OWNER_DRAWN + wxClientDC vDc(this); +#if wxUSE_MENUS_NATIVE // - // is it a menu item or control? + // Is it a menu item? // - wxWindow* pItem = FindItem(vId); - -#if wxUSE_OWNER_DRAWN - if (pItem && pItem->IsKindOf(CLASSINFO(wxControl))) - { - return ((wxControl *)pItem)->OS2OnDraw(pItemStruct); - } - else if (pItem && pItem->IsKindOf(CLASSINFO(wxMenu))) + if (vId == 0) { - /* - // TODO: draw a menu item + ERRORID vError; + wxString sError; + POWNERITEM pMeasureStruct = (POWNERITEM)pItemStruct; + wxFrame* pFrame = (wxFrame*)this; + wxMenuItem* pMenuItem = pFrame->GetMenuBar()->FindItem(pMeasureStruct->idItem, pMeasureStruct->hItem); + HDC hDC = ::GpiQueryDevice(pMeasureStruct->hps); + wxRect vRect( pMeasureStruct->rclItem.xLeft + ,pMeasureStruct->rclItem.yBottom + ,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft + ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom + ); + + wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl(); + impl->SetHDC( hDC, false ); + impl->SetHPS( pMeasureStruct->hps ); + // + // Load the wxWidgets Pallete and set to RGB mode + // + if (!::GpiCreateLogColorTable( pMeasureStruct->hps + ,0L + ,LCOLF_CONSECRGB + ,0L + ,(LONG)wxTheColourDatabase->m_nSize + ,(PLONG)wxTheColourDatabase->m_palTable + )) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError(wxT("Unable to set current color table (1). Error: %s\n"), sError.c_str()); + } // - POWNERITEM pDrawStruct = (OWNERITEM *)pItemStruct; - wxMenuItem* pMenuItem = (wxMenuItem *)(pDrawStruct->pItemData); + // Set the color table to RGB mode + // + if (!::GpiCreateLogColorTable( pMeasureStruct->hps + ,0L + ,LCOLF_RGB + ,0L + ,0L + ,NULL + )) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError(wxT("Unable to set current color table (2). Error: %s\n"), sError.c_str()); + } + + wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE ); - wxCHECK(pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE); + int eAction = 0; + int eStatus = 0; + if (pMeasureStruct->fsAttribute == pMeasureStruct->fsAttributeOld) + { + // + // Entire Item needs to be redrawn (either it has reappeared from + // behind another window or is being displayed for the first time + // + eAction = wxOwnerDrawn::wxODDrawAll; + + if (pMeasureStruct->fsAttribute & MIA_HILITED) + { + // + // If it is currently selected we let the system handle it + // + eStatus |= wxOwnerDrawn::wxODSelected; + } + if (pMeasureStruct->fsAttribute & MIA_CHECKED) + { + // + // If it is currently checked we draw our own + // + eStatus |= wxOwnerDrawn::wxODChecked; + pMeasureStruct->fsAttributeOld = pMeasureStruct->fsAttribute &= ~MIA_CHECKED; + } + if (pMeasureStruct->fsAttribute & MIA_DISABLED) + { + // + // If it is currently disabled we let the system handle it + // + eStatus |= wxOwnerDrawn::wxODDisabled; + } + // + // Don't really care about framed (indicationg focus) or NoDismiss + // + } + else + { + if (pMeasureStruct->fsAttribute & MIA_HILITED) + { + eAction = wxOwnerDrawn::wxODDrawAll; + eStatus |= wxOwnerDrawn::wxODSelected; + // + // Keep the system from trying to highlight with its bogus colors + // + pMeasureStruct->fsAttributeOld = pMeasureStruct->fsAttribute &= ~MIA_HILITED; + } + else if (!(pMeasureStruct->fsAttribute & MIA_HILITED)) + { + eAction = wxOwnerDrawn::wxODDrawAll; + eStatus = 0; + // + // Keep the system from trying to highlight with its bogus colors + // + pMeasureStruct->fsAttribute = pMeasureStruct->fsAttributeOld &= ~MIA_HILITED; + } + else + { + // + // For now we don't care about anything else + // just ignore the entire message! + // + return true; + } + } // - // Prepare to call OnDrawItem() + // Now redraw the item + // + return(pMenuItem->OnDrawItem( vDc + ,vRect + ,(wxOwnerDrawn::wxODAction)eAction + ,(wxOwnerDrawn::wxODStatus)eStatus + )); + // + // leave the fsAttribute and fsOldAttribute unchanged. If different, + // the system will do the highlight or fraeming or disabling for us, + // otherwise, we'd have to do it ourselves. // - HPSdc; - dc.SetHDC((WXHDC)pDrawStruct->hDC, FALSE); - wxRect rect(pDrawStruct->rcItem.left, pDrawStruct->rcItem.top, - pDrawStruct->rcItem.right - pDrawStruct->rcItem.left, - pDrawStruct->rcItem.bottom - pDrawStruct->rcItem.top); - - return pMenuItem->OnDrawItem - ( - dc, rect, - (wxOwnerDrawn::wxODAction)pDrawStruct->itemAction, - (wxOwnerDrawn::wxODStatus)pDrawStruct->itemState - ); - */ } +#endif // wxUSE_MENUS_NATIVE - else - return FALSE; + wxWindow* pItem = FindItem(vId); + + if (pItem && pItem->IsKindOf(CLASSINFO(wxControl))) + { + return ((wxControl *)pItem)->OS2OnDraw(pItemStruct); + } +#else + vId = vId; + pItemStruct = pItemStruct; #endif - return TRUE; -} // end of wxWindow::OS2OnDrawItem + return false; +} // end of wxWindowOS2::OS2OnDrawItem -bool wxWindow::OS2OnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct) +long wxWindowOS2::OS2OnMeasureItem( int lId, + WXMEASUREITEMSTRUCT* pItemStruct ) { - // TODO: more owner drawn menu related stuff, get to it later -/* #if wxUSE_OWNER_DRAWN - // is it a menu item? - if ( id == 0 ) + // + // Is it a menu item? + // + if (lId == 65536) // I really don't like this...has to be a better indicator { - MEASUREITEMSTRUCT *pMeasureStruct = (MEASUREITEMSTRUCT *)itemStruct; - wxMenuItem *pMenuItem = (wxMenuItem *)(pMeasureStruct->itemData); - - wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE ); - - return pMenuItem->OnMeasureItem(&pMeasureStruct->itemWidth, - &pMeasureStruct->itemHeight); + if (IsKindOf(CLASSINFO(wxFrame))) // we'll assume if Frame then a menu + { + size_t nWidth; + size_t nHeight; + POWNERITEM pMeasureStruct = (POWNERITEM)pItemStruct; + wxFrame* pFrame = (wxFrame*)this; + wxMenuItem* pMenuItem = pFrame->GetMenuBar()->FindItem(pMeasureStruct->idItem, pMeasureStruct->hItem); + + wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE ); + nWidth = 0L; + nHeight = 0L; + if (pMenuItem->OnMeasureItem( &nWidth + ,&nHeight + )) + { + MRESULT mRc; + + pMeasureStruct->rclItem.xRight = nWidth; + pMeasureStruct->rclItem.xLeft = 0L; + pMeasureStruct->rclItem.yTop = nHeight; + pMeasureStruct->rclItem.yBottom = 0L; + mRc = MRFROM2SHORT(nHeight, nWidth); + return LONGFROMMR(mRc); + } + return 0L; + } } + wxWindow* pItem = FindItem(lId); - wxWindow *item = FindItem(id); - if ( item && item->IsKindOf(CLASSINFO(wxControl)) ) + if (pItem && pItem->IsKindOf(CLASSINFO(wxControl))) { - return ((wxControl *)item)->MSWOnMeasure(itemStruct); + OWNERITEM vItem; + + vItem.idItem = (LONG)pItemStruct; + return ((wxControl *)pItem)->OS2OnMeasure((WXMEASUREITEMSTRUCT*)&vItem); } -#endif // owner-drawn menus -*/ +#else + lId = lId; + pItemStruct = pItemStruct; +#endif // wxUSE_OWNER_DRAWN return FALSE; } @@ -2714,45 +3411,35 @@ bool wxWindow::OS2OnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct) // colours and palettes // --------------------------------------------------------------------------- -bool wxWindow::HandleSysColorChange() +bool wxWindowOS2::HandleSysColorChange() { wxSysColourChangedEvent vEvent; vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleSysColorChange + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleSysColorChange -bool wxWindow::HandleCtlColor( - WXHBRUSH* phBrush -) +bool wxWindowOS2::HandleCtlColor( WXHBRUSH* WXUNUSED(phBrush) ) { // // Not much provided with message. So not sure I can do anything with it // - return TRUE; -} // end of wxWindow::HandleCtlColor + return true; +} // end of wxWindowOS2::HandleCtlColor -bool wxWindow::HandleWindowParams( - PWNDPARAMS pWndParams -, WXLPARAM lParam -) -{ -// TODO: I'll do something here, just not sure what yet - return TRUE; -} // Define for each class of dialog and control -WXHBRUSH wxWindow::OnCtlColor(WXHDC hDC, - WXHWND hWnd, - WXUINT nCtlColor, - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam) +WXHBRUSH wxWindowOS2::OnCtlColor(WXHDC WXUNUSED(hDC), + WXHWND WXUNUSED(hWnd), + WXUINT WXUNUSED(nCtlColor), + WXUINT WXUNUSED(message), + WXWPARAM WXUNUSED(wParam), + WXLPARAM WXUNUSED(lParam)) { return (WXHBRUSH)0; } -bool wxWindow::HandlePaletteChanged() +bool wxWindowOS2::HandlePaletteChanged() { // need to set this to something first WXHWND hWndPalChange = NULLHANDLE; @@ -2762,165 +3449,298 @@ bool wxWindow::HandlePaletteChanged() vEvent.SetEventObject(this); vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange)); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandlePaletteChanged - -bool wxWindow::HandlePresParamChanged( - WXWPARAM wParam -) -{ - // - // TODO: Once again I'll do something here when I need it - // - //wxQueryNewPaletteEvent event(GetId()); - //event.SetEventObject(this); - // if the background is erased -// bProcessed = HandleEraseBkgnd((WXHDC)(HDC)wParam); - - return FALSE; //GetEventHandler()->ProcessEvent(event) && event.GetPaletteRealized(); -} + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandlePaletteChanged // // Responds to colour changes: passes event on to children. // -void wxWindow::OnSysColourChanged( +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; - pWin->GetEventHandler()->ProcessEvent(vEvent); + rEvent.SetEventObject(pWin); + pWin->HandleWindowEvent(vEvent); } - pNode = pNode->Next(); + node = node->GetNext(); } -} // end of wxWindow::OnSysColourChanged +} // end of wxWindowOS2::OnSysColourChanged // --------------------------------------------------------------------------- // painting // --------------------------------------------------------------------------- -bool wxWindow::HandlePaint() +void wxWindow::OnPaint ( + wxPaintEvent& rEvent +) +{ + HDC hDC = (HDC)wxPaintDCImpl::FindDCInCache((wxWindow*) rEvent.GetEventObject()); + + if (hDC != 0) + { + OS2DefWindowProc( (WXUINT)WM_PAINT + ,(WXWPARAM)hDC + ,(WXLPARAM)0 + ); + } +} // end of wxWindow::OnPaint + +bool wxWindowOS2::HandlePaint() { - HRGN hRgn = NULLHANDLE; - wxPaintEvent vEvent; + HRGN hRgn; + wxPaintEvent vEvent(m_windowId); HPS hPS; - RECTL vRect; + bool bProcessed; + + // Create empty region + // TODO: get HPS somewhere else if possible + hPS = ::WinGetPS(GetHwnd()); + hRgn = ::GpiCreateRegion(hPS, 0, NULL); - if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_NULL) + if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_ERROR) { - wxLogLastError("CreateRectRgn"); - return FALSE; + wxLogLastError(wxT("CreateRectRgn")); + return false; } - m_updateRegion = wxRegion(hRgn); -/* - hPS = WinBeginPaint(GetHWND(), 0L, &vRect); - WinFillRect(hPS, &vRect, SYSCLR_WINDOW); - WinEndPaint(hPS); -*/ + // 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. + // + 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].yBottom = height - pUpdateRects[i].yTop; + pUpdateRects[i].yTop = pUpdateRects[i].yBottom + rectHeight; + } + ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects); + delete [] pUpdateRects; + } + } + m_updateRegion = wxRegion(hRgn, hPS); + vEvent.SetEventObject(this); - return (GetEventHandler()->ProcessEvent(vEvent)); -} // end of wxWindow::HandlePaint + bProcessed = HandleWindowEvent(vEvent); + + if (!bProcessed && + IsKindOf(CLASSINFO(wxPanel)) && + GetChildren().GetCount() == 0 + ) + { + // + // OS/2 needs to process this right here, not by the default proc + // 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; + + 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()); + if (m_dwExStyle) + { + LINEBUNDLE vLineBundle; + + vLineBundle.lColor = 0x00000000; // Black + vLineBundle.usMixMode = FM_OVERPAINT; + vLineBundle.fxWidth = 1; + vLineBundle.lGeomWidth = 1; + vLineBundle.usType = LINETYPE_SOLID; + vLineBundle.usEnd = 0; + vLineBundle.usJoin = 0; + ::GpiSetAttrs( hPS + ,PRIM_LINE + ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE + ,0L + ,&vLineBundle + ); + ::WinQueryWindowRect(GetHwnd(), &vRect); + wxDrawBorder( hPS + ,vRect + ,m_dwExStyle + ); + } + } + ::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 + ); -bool wxWindow::HandleEraseBkgnd(WXHDC hdc) + if (::WinIsWindowVisible(GetHWND())) + ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); + } + ::WinEndPaint(hPS); + bProcessed = true; + } + return bProcessed; +} // end of wxWindowOS2::HandlePaint + +bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC ) { - // TODO: will have to worry about this later as part of - // the handling of changed presentation parameters - /* - if ( ::IsIconic(GetHwnd()) ) - return TRUE; + SWP vSwp; + bool rc; + + ::WinQueryWindowPos(GetHwnd(), &vSwp); + if (vSwp.fl & SWP_MINIMIZE) + return true; - wxDC dc; + wxClientDC vDC(this); + wxPMDCImpl *impl = (wxPMDCImpl*) vDC.GetImpl(); + impl->SetHDC(hDC); + impl->SetHPS((HPS)hDC); // this is really a PS - dc.SetHDC(hdc); - dc.SetWindow(this); - dc.BeginDrawing(); + wxEraseEvent vEvent(m_windowId, &vDC); - wxEraseEvent event(m_windowId, &dc); - event.SetEventObject(this); - bool rc = GetEventHandler()->ProcessEvent(event); + vEvent.SetEventObject(this); - dc.EndDrawing(); - dc.SelectOldObjects(hdc); - dc.SetHDC((WXHDC) NULL); - */ - return TRUE; -} // end of wxWindow::HandleEraseBkgnd + rc = HandleWindowEvent(vEvent); -void wxWindow::OnEraseBackground( - wxEraseEvent& rEvent -) + impl->SetHPS(NULLHANDLE); + return true; +} // end of wxWindowOS2::HandleEraseBkgnd + +void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent) { - // TODO: -} // end of wxWindow::OnEraseBackground + RECTL vRect; + wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl(); + HPS hPS = impl->GetHPS(); + APIRET rc; + LONG lColor = m_backgroundColour.GetPixel(); + + rc = ::WinQueryWindowRect(GetHwnd(), &vRect); + rc = ::WinFillRect(hPS, &vRect, lColor); +} // end of wxWindowOS2::OnEraseBackground // --------------------------------------------------------------------------- // moving and resizing // --------------------------------------------------------------------------- -bool wxWindow::HandleMinimize() +bool wxWindowOS2::HandleMinimize() { wxIconizeEvent vEvent(m_windowId); vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleMinimize + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleMinimize -bool wxWindow::HandleMaximize() +bool wxWindowOS2::HandleMaximize() { wxMaximizeEvent vEvent(m_windowId); vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleMaximize + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleMaximize -bool wxWindow::HandleMove( - int nX -, int nY -) +bool wxWindowOS2::HandleMove( int nX, int nY ) { - wxMoveEvent vEvent( wxPoint( nX - ,nY - ) - ,m_windowId - ); + wxPoint pt(nX, nY); + wxMoveEvent vEvent(pt, m_windowId); vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleMove + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleMove -bool wxWindow::HandleSize( - int nWidth -, int nHeight -, WXUINT WXUNUSED(nFlag) -) +bool wxWindowOS2::HandleSize( int nWidth, + int nHeight, + WXUINT WXUNUSED(nFlag) ) { - wxSizeEvent vEvent( wxSize( nWidth - ,nHeight - ) - ,m_windowId - ); + wxSize sz(nWidth, nHeight); + wxSizeEvent vEvent(sz, m_windowId); vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleSize + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::HandleSize -bool wxWindow::HandleGetMinMaxInfo( - PSWP pSwp -) +bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp ) { - bool bRc = FALSE; POINTL vPoint; switch(pSwp->fl) @@ -2938,20 +3758,19 @@ bool wxWindow::HandleGetMinMaxInfo( break; default: - return FALSE; + return false; } - return TRUE; -} // end of wxWindow::HandleGetMinMaxInfo + return true; +} // end of wxWindowOS2::HandleGetMinMaxInfo // --------------------------------------------------------------------------- // command messages // --------------------------------------------------------------------------- -bool wxWindow::HandleCommand( - WXWORD wId -, WXWORD wCmd -, WXHWND hControl -) +bool wxWindowOS2::HandleCommand( WXWORD wId, + WXWORD wCmd, + WXHWND hControl ) { +#if wxUSE_MENUS_NATIVE if (wxCurrentPopupMenu) { wxMenu* pPopupMenu = wxCurrentPopupMenu; @@ -2959,6 +3778,7 @@ bool wxWindow::HandleCommand( wxCurrentPopupMenu = NULL; return pPopupMenu->OS2Command(wCmd, wId); } +#endif // wxUSE_MENUS_NATIVE wxWindow* pWin = FindItem(wId); @@ -2968,16 +3788,13 @@ bool wxWindow::HandleCommand( } if (pWin) - return pWin->OS2Command( wCmd - ,wId - ); - return FALSE; -} // end of wxWindow::HandleCommand + return pWin->OS2Command(wCmd, wId); -bool wxWindow::HandleSysCommand( - WXWPARAM wParam -, WXLPARAM lParam -) + return false; +} // end of wxWindowOS2::HandleCommand + +bool wxWindowOS2::HandleSysCommand( WXWPARAM wParam, + WXLPARAM WXUNUSED(lParam) ) { // // 4 bits are reserved @@ -2990,47 +3807,52 @@ bool wxWindow::HandleSysCommand( case SC_MINIMIZE: return HandleMinimize(); } - return FALSE; -} // end of wxWindow::HandleSysCommand + return false; +} // end of wxWindowOS2::HandleSysCommand // --------------------------------------------------------------------------- // mouse events // --------------------------------------------------------------------------- - -void wxWindow::InitMouseEvent( +//TODO: check against MSW +void wxWindowOS2::InitMouseEvent( wxMouseEvent& rEvent , int nX , int nY , 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 = IsKeyDown(VK_BUTTON1); + rEvent.m_middleDown = IsKeyDown(VK_BUTTON3); + rEvent.m_rightDown = IsKeyDown(VK_BUTTON2); rEvent.SetTimestamp(s_currentMsg.time); - rEvent.m_eventObject = this; + rEvent.SetEventObject(this); + rEvent.SetId(GetId()); #if wxUSE_MOUSEEVENT_HACK m_lastMouseX = nX; m_lastMouseY = nY; m_lastMouseEvent = rEvent.GetEventType(); #endif // wxUSE_MOUSEEVENT_HACK -} // end of wxWindow::InitMouseEvent +} // end of wxWindowOS2::InitMouseEvent -bool wxWindow::HandleMouseEvent( - WXUINT uMsg -, int nX -, int nY -, WXUINT uFlags -) +bool wxWindowOS2::HandleMouseEvent( WXUINT uMsg, + int nX, + int nY, + WXUINT uFlags ) { + bool bProcessed = false; + // // 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 // @@ -3048,31 +3870,44 @@ bool wxWindow::HandleMouseEvent( wxEVT_MIDDLE_DCLICK }; - wxMouseEvent vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]); + // Bounds check + if ((uMsg >= WM_MOUSEMOVE) && (uMsg <= WM_BUTTON3DBLCLK)) + { + wxMouseEvent vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]); - InitMouseEvent( vEvent - ,nX - ,nY - ,uFlags - ); + InitMouseEvent( vEvent + ,nX + ,nY + ,uFlags + ); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::HandleMouseEvent + bProcessed = HandleWindowEvent(vEvent); + if (!bProcessed) + { + HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR(); -bool wxWindow::HandleMouseMove( - int nX -, int nY -, WXUINT uFlags -) + if (hCursor != NULLHANDLE) + { + ::WinSetPointer(HWND_DESKTOP, hCursor); + bProcessed = true; + } + } + } + return bProcessed; +} // end of wxWindowOS2::HandleMouseEvent + +bool wxWindowOS2::HandleMouseMove( int nX, + int nY, + WXUINT uFlags ) { if (!m_bMouseInWindow) { // // Generate an ENTER event // - m_bMouseInWindow = TRUE; + m_bMouseInWindow = true; - wxMouseEvent vEvent(wxEVT_ENTER_WINDOW); + wxMouseEvent vEvent(wxEVT_ENTER_WINDOW); InitMouseEvent( vEvent ,nX @@ -3080,14 +3915,14 @@ bool wxWindow::HandleMouseMove( ,uFlags ); - (void)GetEventHandler()->ProcessEvent(vEvent); + (void)HandleWindowEvent(vEvent); } return HandleMouseEvent( WM_MOUSEMOVE ,nX ,nY ,uFlags ); -} // end of wxWindow::HandleMouseMove +} // end of wxWindowOS2::HandleMouseMove // --------------------------------------------------------------------------- // keyboard handling @@ -3097,10 +3932,11 @@ bool wxWindow::HandleMouseMove( // Create the key event of the given type for the given key - used by // HandleChar and HandleKeyDown/Up // -wxKeyEvent wxWindow::CreateKeyEvent( +wxKeyEvent wxWindowOS2::CreateKeyEvent( wxEventType eType , int nId , WXLPARAM lParam +, WXWPARAM wParam ) const { wxKeyEvent vEvent(eType); @@ -3110,8 +3946,10 @@ wxKeyEvent wxWindow::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; vEvent.SetTimestamp(s_currentMsg.time); // @@ -3132,27 +3970,37 @@ wxKeyEvent wxWindow::CreateKeyEvent( vEvent.m_y = vPoint.y; return vEvent; -} // end of wxWindow::CreateKeyEvent +} // end of wxWindowOS2::CreateKeyEvent // -// isASCII is TRUE only when we're called from WM_CHAR handler and not from +// isASCII is true only when we're called from WM_CHAR handler and not from // WM_KEYDOWN one // -bool wxWindow::HandleChar( - WXWORD wParam -, WXLPARAM lParam -, bool isASCII -) +bool wxWindowOS2::HandleChar( WXWPARAM WXUNUSED(wParam), + WXLPARAM lParam, + bool isASCII ) { - bool bCtrlDown = FALSE; - int vId; + bool bCtrlDown = false; + int vId; + if (m_bLastKeydownProcessed) + { + // + // The key was handled in the EVT_KEY_DOWN. Handling a key in an + // EVT_KEY_DOWN handler is meant, by design, to prevent EVT_CHARs + // from happening, so just bail out at this point. + // + m_bLastKeydownProcessed = false; + return true; + } 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 = wParam; + vId = SHORT1FROMMP(lParam); if ((vId > 0) && (vId < 27)) { switch (vId) @@ -3170,95 +4018,83 @@ bool wxWindow::HandleChar( break; default: - bCtrlDown = TRUE; - vId = vId + 96; + bCtrlDown = true; + break; } } } - else if ( (vId = wxCharCodeOS2ToWX(wParam)) == 0) + else // we're called from WM_KEYDOWN { - // - // It's ASCII and will be processed here only when called from - // WM_CHAR (i.e. when isASCII = TRUE), don't process it now - // - vId = -1; + vId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); + if (vId == 0) + return false; } - if (vId != -1) - { - wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR - ,vId - ,lParam - )); - - if (bCtrlDown) - { - vEvent.m_controlDown = TRUE; - } + wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR, vId, lParam )); - if (GetEventHandler()->ProcessEvent(vEvent)) - return TRUE; + if (bCtrlDown) + { + vEvent.m_controlDown = true; } - return FALSE; + + return (HandleWindowEvent(vEvent)); } -bool wxWindow::HandleKeyDown( - WXWORD wParam -, WXLPARAM lParam -) +bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam, + WXLPARAM lParam ) { - int nId = wxCharCodeOS2ToWX(wParam); + int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); if (!nId) { // // Normal ASCII char // - nId = wParam; + nId = SHORT1FROMMP(lParam); } if (nId != -1) { - wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_DOWN - ,nId - ,lParam - )); + wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_DOWN + ,nId + ,(MPARAM)lParam + ,(MPARAM)wParam + )); - if (GetEventHandler()->ProcessEvent(vEvent)) + if (HandleWindowEvent(vEvent)) { - return TRUE; + return true; } } - return FALSE; -} // end of wxWindow::HandleKeyDown + return false; +} // end of wxWindowOS2::HandleKeyDown -bool wxWindow::HandleKeyUp( - WXWORD wParam -, WXLPARAM lParam -) +bool wxWindowOS2::HandleKeyUp( WXWPARAM wParam, + WXLPARAM lParam ) { - int nId = wxCharCodeOS2ToWX(wParam); + int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); if (!nId) { // // Normal ASCII char // - nId = wParam; + nId = CHAR1FROMMP(lParam); } if (nId != -1) { - wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP - ,nId - ,lParam - )); - - if (GetEventHandler()->ProcessEvent(vEvent)) - return TRUE; + wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP + ,nId + ,(MPARAM)lParam + ,(MPARAM)wParam + )); + + if (HandleWindowEvent(vEvent)) + return true; } - return FALSE; -} // end of wxWindow::HandleKeyUp + return false; +} // end of wxWindowOS2::HandleKeyUp // --------------------------------------------------------------------------- // joystick @@ -3268,12 +4104,10 @@ bool wxWindow::HandleKeyUp( // scrolling // --------------------------------------------------------------------------- -bool wxWindow::OS2OnScroll( - int nOrientation -, WXWORD wParam -, WXWORD wPos -, WXHWND hControl -) +bool wxWindowOS2::OS2OnScroll( int nOrientation, + WXWORD wParam, + WXWORD wPos, + WXHWND hControl ) { if (hControl) { @@ -3291,39 +4125,141 @@ bool wxWindow::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: - return FALSE; + return false; + } + return HandleWindowEvent(vEvent); +} // end of wxWindowOS2::OS2OnScroll + +// +// Getting the Y position for a window, like a control, is a real +// pain. There are three situations we must deal with in determining +// 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 +// size so the standard: Y = ParentHeight - (Y + ControlHeight); +// +// 2) The controls are direct children of a frame +// In this instance the controls are actually children of the Frame's +// client. During creation the frame's client resizes several times +// during creation of the status bar and toolbars. The CFrame class +// will take care of this using its AlterChildPos proc. +// +// 3) The controls are children of a panel, which in turn is a child of +// a frame. +// The panel may be one of many, in which case the same treatment +// as 1 applies. It may be the only child, though. +// This is the nastiest case. A panel is created as the only child of +// the frame and as such, when a frame has only one child, the child is +// expanded to fit the entire client area of the frame. Because the +// controls are created BEFORE this occurs their positions are totally +// whacked and any call to WinQueryWindowPos will return invalid +// coordinates. So for this situation we have to compare the size of +// the panel at control creation time with that of the frame client. If +// they are the same we can use the standard Y position equation. If +// not, then we must use the Frame Client's dimensions to position them +// as that will be the eventual size of the panel after the frame resizes +// it! +// +int wxWindowOS2::GetOS2ParentHeight( wxWindowOS2* pParent ) +{ + if (pParent) + { + // + // Case 1 + // + if (pParent->IsKindOf(CLASSINFO(wxDialog))) + return(pParent->GetClientSize().y); + + // + // Case 2 -- if we are one of the separately built standard Frame + // children, like a statusbar, menubar, or toolbar we want to + // use the frame, itself, for positioning. Otherwise we are + // child window and want to use the Frame's client. + // + else if (pParent->IsKindOf(CLASSINFO(wxFrame))) + { + if (IsKindOf(CLASSINFO(wxStatusBar)) || + IsKindOf(CLASSINFO(wxMenuBar)) || + IsKindOf(CLASSINFO(wxToolBar)) + ) + { + if (IsKindOf(CLASSINFO(wxToolBar))) + { + wxFrame* pFrame = wxDynamicCast(GetParent(), wxFrame); + + if (pFrame->GetToolBar() == this) + return(pParent->GetSize().y); + else + return(pParent->GetClientSize().y); + } + else + return(pParent->GetSize().y); + } + else + return(pParent->GetClientSize().y); + } + // + // Case -- this is for any window that is the sole child of a Frame. + // The grandparent must exist and it must be of type CFrame + // and it's height must be different. Otherwise the standard + // applies. + // + else + return(pParent->GetClientSize().y); } - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxWindow::OS2OnScroll + else // We must be a child of the screen + { + int nHeight; + wxDisplaySize(NULL,&nHeight); + return(nHeight); + } +} // end of wxWindowOS2::GetOS2ParentHeight + +// +// OS/2 needs a lot extra manipulation to deal with layouts +// for canvas windows, particularly scrolled ones. +// +wxWindowCreationHook::wxWindowCreationHook( + wxWindow* pWinBeingCreated +) +{ + gpWinBeingCreated = pWinBeingCreated; +} // end of wxWindowCreationHook::wxWindowCreationHook + +wxWindowCreationHook::~wxWindowCreationHook() +{ + gpWinBeingCreated = NULL; +} // end of wxWindowCreationHook::~wxWindowCreationHook // =========================================================================== // global functions @@ -3333,10 +4269,31 @@ void wxGetCharSize( WXHWND hWnd , int* pX , int* pY -,wxFont* pTheFont +,wxFont* WXUNUSED(pTheFont) ) { - // TODO: we'll do this later + FONTMETRICS vFM; + HPS hPS; + BOOL rc; + + hPS =::WinGetPS(hWnd); + + rc = ::GpiQueryFontMetrics(hPS, sizeof(FONTMETRICS), &vFM); + if (rc) + { + if (pX) + *pX = vFM.lAveCharWidth; + if (pY) + *pY = vFM.lEmHeight + vFM.lExternalLeading; + } + else + { + if (pX) + *pX = 10; + if (pY) + *pY = 15; + } + ::WinReleasePS(hPS); } // end of wxGetCharSize // @@ -3359,6 +4316,8 @@ int wxCharCodeOS2ToWX( case VK_CTRL: nId = WXK_CONTROL; break; case VK_PAUSE: nId = WXK_PAUSE; break; case VK_SPACE: nId = WXK_SPACE; break; + case VK_PAGEUP: nId = WXK_PAGEUP; break; + case VK_PAGEDOWN: nId = WXK_PAGEDOWN; break; case VK_ESC: nId = WXK_ESCAPE; break; case VK_END: nId = WXK_END; break; case VK_HOME : nId = WXK_HOME; break; @@ -3369,6 +4328,7 @@ int wxCharCodeOS2ToWX( case VK_PRINTSCRN: nId = WXK_PRINT; break; case VK_INSERT: nId = WXK_INSERT; break; case VK_DELETE: nId = WXK_DELETE; break; + case VK_CAPSLOCK: nId = WXK_CAPITAL; break; case VK_F1: nId = WXK_F1; break; case VK_F2: nId = WXK_F2; break; case VK_F3: nId = WXK_F3; break; @@ -3393,6 +4353,17 @@ int wxCharCodeOS2ToWX( case VK_F22: nId = WXK_F22; break; case VK_F23: nId = WXK_F23; break; case VK_F24: nId = WXK_F24; break; + case VK_OEM_1: nId = ';'; break; + case VK_OEM_PLUS: nId = '+'; break; + case VK_OEM_COMMA: nId = ','; break; + case VK_OEM_MINUS: nId = '-'; break; + case VK_OEM_PERIOD: nId = '.'; break; + case VK_OEM_2: nId = '/'; break; + case VK_OEM_3: nId = '~'; break; + case VK_OEM_4: nId = '['; break; + case VK_OEM_5: nId = '\\'; break; + case VK_OEM_6: nId = ']'; break; + case VK_OEM_7: nId = '\''; break; case VK_NUMLOCK: nId = WXK_NUMLOCK; break; case VK_SCRLLOCK: nId = WXK_SCROLL; break; default: @@ -3403,20 +4374,21 @@ int wxCharCodeOS2ToWX( return nId; } // end of wxCharCodeOS2ToWX -int wxCharCodeWXToOS2( - int nId -, bool* bIsVirtual -) +int wxCharCodeWXToOS2( int nId, + bool* bIsVirtual) { - int nKeySym = 0; + int nKeySym = 0; - *bIsVirtual = TRUE; + if ( bIsVirtual ) + *bIsVirtual = true; switch (nId) { case WXK_CLEAR: nKeySym = VK_CLEAR; break; case WXK_SHIFT: nKeySym = VK_SHIFT; break; case WXK_CONTROL: nKeySym = VK_CTRL; break; case WXK_PAUSE: nKeySym = VK_PAUSE; break; + case WXK_PAGEUP: nKeySym = VK_PAGEUP; break; + case WXK_PAGEDOWN: nKeySym = VK_PAGEDOWN; break; case WXK_END: nKeySym = VK_END; break; case WXK_HOME : nKeySym = VK_HOME; break; case WXK_LEFT : nKeySym = VK_LEFT; break; @@ -3454,7 +4426,8 @@ int wxCharCodeWXToOS2( case WXK_SCROLL: nKeySym = VK_SCRLLOCK; break; default: { - *bIsVirtual = FALSE; + if ( bIsVirtual ) + *bIsVirtual = false; nKeySym = nId; break; } @@ -3462,6 +4435,29 @@ int wxCharCodeWXToOS2( return nKeySym; } // end of wxCharCodeWXToOS2 + +bool wxGetKeyState(wxKeyCode key) +{ + wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != + WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons")); + + const LONG vk = wxCharCodeWXToOS2(key); + // if the requested key is a LED key, return true if the led is pressed + if ( key == WXK_NUMLOCK || key == WXK_CAPITAL || key == WXK_SCROLL ) + { + // low order bit means LED is highlighted and high order one means the + // key is down; for compatibility with the other ports return true if + // either one is set + return ::WinGetKeyState(HWND_DESKTOP, vk) != 0; + + } + else // normal key + { + return IsKeyDown(vk); + } +} + + wxWindow* wxGetActiveWindow() { HWND hWnd = ::WinQueryActiveWindow(HWND_DESKTOP); @@ -3474,471 +4470,471 @@ wxWindow* wxGetActiveWindow() } // end of wxGetActiveWindow #ifdef __WXDEBUG__ -const char* wxGetMessageName( - int nMessage) +const wxChar* wxGetMessageName( int nMessage ) { switch (nMessage) { - case 0x0000: return "WM_NULL"; - case 0x0001: return "WM_CREATE"; - case 0x0002: return "WM_DESTROY"; - case 0x0004: return "WM_ENABLE"; - case 0x0005: return "WM_SHOW"; - case 0x0006: return "WM_MOVE"; - case 0x0007: return "WM_SIZE"; - case 0x0008: return "WM_ADJUSTWINDOWPOS"; - case 0x0009: return "WM_CALCVALIDRECTS"; - case 0x000A: return "WM_SETWINDOWPARAMS"; - case 0x000B: return "WM_QUERYWINDOWPARAMS"; - case 0x000C: return "WM_HITTEST"; - case 0x000D: return "WM_ACTIVATE"; - case 0x000F: return "WM_SETFOCUS"; - case 0x0010: return "WM_SETSELECTION"; - case 0x0011: return "WM_PPAINT"; - case 0x0012: return "WM_PSETFOCUS"; - case 0x0013: return "WM_PSYSCOLORCHANGE"; - case 0x0014: return "WM_PSIZE"; - case 0x0015: return "WM_PACTIVATE"; - case 0x0016: return "WM_PCONTROL"; - case 0x0020: return "WM_COMMAND"; - case 0x0021: return "WM_SYSCOMMAND"; - case 0x0022: return "WM_HELP"; - case 0x0023: return "WM_PAINT"; - case 0x0024: return "WM_TIMER"; - case 0x0025: return "WM_SEM1"; - case 0x0026: return "WM_SEM2"; - case 0x0027: return "WM_SEM3"; - case 0x0028: return "WM_SEM4"; - case 0x0029: return "WM_CLOSE"; - case 0x002A: return "WM_QUIT"; - case 0x002B: return "WM_SYSCOLORCHANGE"; - case 0x002D: return "WM_SYSVALUECHANGE"; - case 0x002E: return "WM_APPTERMINATENOTIFY"; - case 0x002F: return "WM_PRESPARAMCHANGED"; + case 0x0000: return wxT("WM_NULL"); + case 0x0001: return wxT("WM_CREATE"); + case 0x0002: return wxT("WM_DESTROY"); + case 0x0004: return wxT("WM_ENABLE"); + case 0x0005: return wxT("WM_SHOW"); + case 0x0006: return wxT("WM_MOVE"); + case 0x0007: return wxT("WM_SIZE"); + case 0x0008: return wxT("WM_ADJUSTWINDOWPOS"); + case 0x0009: return wxT("WM_CALCVALIDRECTS"); + case 0x000A: return wxT("WM_SETWINDOWPARAMS"); + case 0x000B: return wxT("WM_QUERYWINDOWPARAMS"); + case 0x000C: return wxT("WM_HITTEST"); + case 0x000D: return wxT("WM_ACTIVATE"); + case 0x000F: return wxT("WM_SETFOCUS"); + case 0x0010: return wxT("WM_SETSELECTION"); + case 0x0011: return wxT("WM_PPAINT"); + case 0x0012: return wxT("WM_PSETFOCUS"); + case 0x0013: return wxT("WM_PSYSCOLORCHANGE"); + case 0x0014: return wxT("WM_PSIZE"); + case 0x0015: return wxT("WM_PACTIVATE"); + case 0x0016: return wxT("WM_PCONTROL"); + case 0x0020: return wxT("WM_COMMAND"); + case 0x0021: return wxT("WM_SYSCOMMAND"); + case 0x0022: return wxT("WM_HELP"); + case 0x0023: return wxT("WM_PAINT"); + case 0x0024: return wxT("WM_TIMER"); + case 0x0025: return wxT("WM_SEM1"); + case 0x0026: return wxT("WM_SEM2"); + case 0x0027: return wxT("WM_SEM3"); + case 0x0028: return wxT("WM_SEM4"); + case 0x0029: return wxT("WM_CLOSE"); + case 0x002A: return wxT("WM_QUIT"); + case 0x002B: return wxT("WM_SYSCOLORCHANGE"); + case 0x002D: return wxT("WM_SYSVALUECHANGE"); + case 0x002E: return wxT("WM_APPTERMINATENOTIFY"); + case 0x002F: return wxT("WM_PRESPARAMCHANGED"); // Control notification messages - case 0x0030: return "WM_CONTROL"; - case 0x0031: return "WM_VSCROLL"; - case 0x0032: return "WM_HSCROLL"; - case 0x0033: return "WM_INITMENU"; - case 0x0034: return "WM_MENUSELECT"; - case 0x0035: return "WM_MENUSEND"; - case 0x0036: return "WM_DRAWITEM"; - case 0x0037: return "WM_MEASUREITEM"; - case 0x0038: return "WM_CONTROLPOINTER"; - case 0x003A: return "WM_QUERYDLGCODE"; - case 0x003B: return "WM_INITDLG"; - case 0x003C: return "WM_SUBSTITUTESTRING"; - case 0x003D: return "WM_MATCHMNEMONIC"; - case 0x003E: return "WM_SAVEAPPLICATION"; - case 0x0129: return "WM_CTLCOLORCHANGE"; - case 0x0130: return "WM_QUERYCTLTYPE"; + case 0x0030: return wxT("WM_CONTROL"); + case 0x0031: return wxT("WM_VSCROLL"); + case 0x0032: return wxT("WM_HSCROLL"); + case 0x0033: return wxT("WM_INITMENU"); + case 0x0034: return wxT("WM_MENUSELECT"); + case 0x0035: return wxT("WM_MENUSEND"); + case 0x0036: return wxT("WM_DRAWITEM"); + case 0x0037: return wxT("WM_MEASUREITEM"); + case 0x0038: return wxT("WM_CONTROLPOINTER"); + case 0x003A: return wxT("WM_QUERYDLGCODE"); + case 0x003B: return wxT("WM_INITDLG"); + case 0x003C: return wxT("WM_SUBSTITUTESTRING"); + case 0x003D: return wxT("WM_MATCHMNEMONIC"); + case 0x003E: return wxT("WM_SAVEAPPLICATION"); + case 0x0129: return wxT("WM_CTLCOLORCHANGE"); + case 0x0130: return wxT("WM_QUERYCTLTYPE"); // Frame messages - case 0x0040: return "WM_FLASHWINDOW"; - case 0x0041: return "WM_FORMATFRAME"; - case 0x0042: return "WM_UPDATEFRAME"; - case 0x0043: return "WM_FOCUSCHANGE"; - case 0x0044: return "WM_SETBORDERSIZE"; - case 0x0045: return "WM_TRACKFRAME"; - case 0x0046: return "WM_MINMAXFRAME"; - case 0x0047: return "WM_SETICON"; - case 0x0048: return "WM_QUERYICON"; - case 0x0049: return "WM_SETACCELTABLE"; - case 0x004A: return "WM_QUERYACCELTABLE"; - case 0x004B: return "WM_TRANSLATEACCEL"; - case 0x004C: return "WM_QUERYTRACKINFO"; - case 0x004D: return "WM_QUERYBORDERSIZE"; - case 0x004E: return "WM_NEXTMENU"; - case 0x004F: return "WM_ERASEBACKGROUND"; - case 0x0050: return "WM_QUERYFRAMEINFO"; - case 0x0051: return "WM_QUERYFOCUSCHAIN"; - case 0x0052: return "WM_OWNERPOSCHANGE"; - case 0x0053: return "WM_CACLFRAMERECT"; - case 0x0055: return "WM_WINDOWPOSCHANGED"; - case 0x0056: return "WM_ADJUSTFRAMEPOS"; - case 0x0059: return "WM_QUERYFRAMECTLCOUNT"; - case 0x005B: return "WM_QUERYHELPINFO"; - case 0x005C: return "WM_SETHELPINFO"; - case 0x005D: return "WM_ERROR"; - case 0x005E: return "WM_REALIZEPALETTE"; + case 0x0040: return wxT("WM_FLASHWINDOW"); + case 0x0041: return wxT("WM_FORMATFRAME"); + case 0x0042: return wxT("WM_UPDATEFRAME"); + case 0x0043: return wxT("WM_FOCUSCHANGE"); + case 0x0044: return wxT("WM_SETBORDERSIZE"); + case 0x0045: return wxT("WM_TRACKFRAME"); + case 0x0046: return wxT("WM_MINMAXFRAME"); + case 0x0047: return wxT("WM_SETICON"); + case 0x0048: return wxT("WM_QUERYICON"); + case 0x0049: return wxT("WM_SETACCELTABLE"); + case 0x004A: return wxT("WM_QUERYACCELTABLE"); + case 0x004B: return wxT("WM_TRANSLATEACCEL"); + case 0x004C: return wxT("WM_QUERYTRACKINFO"); + case 0x004D: return wxT("WM_QUERYBORDERSIZE"); + case 0x004E: return wxT("WM_NEXTMENU"); + case 0x004F: return wxT("WM_ERASEBACKGROUND"); + case 0x0050: return wxT("WM_QUERYFRAMEINFO"); + case 0x0051: return wxT("WM_QUERYFOCUSCHAIN"); + case 0x0052: return wxT("WM_OWNERPOSCHANGE"); + case 0x0053: return wxT("WM_CACLFRAMERECT"); + case 0x0055: return wxT("WM_WINDOWPOSCHANGED"); + case 0x0056: return wxT("WM_ADJUSTFRAMEPOS"); + case 0x0059: return wxT("WM_QUERYFRAMECTLCOUNT"); + case 0x005B: return wxT("WM_QUERYHELPINFO"); + case 0x005C: return wxT("WM_SETHELPINFO"); + case 0x005D: return wxT("WM_ERROR"); + case 0x005E: return wxT("WM_REALIZEPALETTE"); // Clipboard messages - case 0x0060: return "WM_RENDERFMT"; - case 0x0061: return "WM_RENDERALLFMTS"; - case 0x0062: return "WM_DESTROYCLIPBOARD"; - case 0x0063: return "WM_PAINTCLIPBOARD"; - case 0x0064: return "WM_SIZECLIPBOARD"; - case 0x0065: return "WM_HSCROLLCLIPBOARD"; - case 0x0066: return "WM_VSCROLLCLIPBOARD"; - case 0x0067: return "WM_DRAWCLIPBOARD"; + case 0x0060: return wxT("WM_RENDERFMT"); + case 0x0061: return wxT("WM_RENDERALLFMTS"); + case 0x0062: return wxT("WM_DESTROYCLIPBOARD"); + case 0x0063: return wxT("WM_PAINTCLIPBOARD"); + case 0x0064: return wxT("WM_SIZECLIPBOARD"); + case 0x0065: return wxT("WM_HSCROLLCLIPBOARD"); + case 0x0066: return wxT("WM_VSCROLLCLIPBOARD"); + case 0x0067: return wxT("WM_DRAWCLIPBOARD"); // mouse messages - case 0x0070: return "WM_MOUSEMOVE"; - case 0x0071: return "WM_BUTTON1DOWN"; - case 0x0072: return "WM_BUTTON1UP"; - case 0x0073: return "WM_BUTTON1DBLCLK"; - case 0x0074: return "WM_BUTTON2DOWN"; - case 0x0075: return "WM_BUTTON2UP"; - case 0x0076: return "WM_BUTTON2DBLCLK"; - case 0x0077: return "WM_BUTTON3DOWN"; - case 0x0078: return "WM_BUTTON3UP"; - case 0x0079: return "WM_BUTTON3DBLCLK"; - case 0x007D: return "WM_MOUSEMAP"; - case 0x007E: return "WM_VRNDISABLED"; - case 0x007F: return "WM_VRNENABLED"; - case 0x0410: return "WM_CHORD"; - case 0x0411: return "WM_BUTTON1MOTIONSTART"; - case 0x0412: return "WM_BUTTON1MOTIONEND"; - case 0x0413: return "WM_BUTTON1CLICK"; - case 0x0414: return "WM_BUTTON2MOTIONSTART"; - case 0x0415: return "WM_BUTTON2MOTIONEND"; - case 0x0416: return "WM_BUTTON2CLICK"; - case 0x0417: return "WM_BUTTON3MOTIONSTART"; - case 0x0418: return "WM_BUTTON3MOTIONEND"; - case 0x0419: return "WM_BUTTON3CLICK"; - case 0x0420: return "WM_BEGINDRAG"; - case 0x0421: return "WM_ENDDRAG"; - case 0x0422: return "WM_SINGLESELECT"; - case 0x0423: return "WM_OPEN"; - case 0x0424: return "WM_CONTEXTMENU"; - case 0x0425: return "WM_CONTEXTHELP"; - case 0x0426: return "WM_TEXTEDIT"; - case 0x0427: return "WM_BEGINSELECT"; - case 0x0228: return "WM_ENDSELECT"; - case 0x0429: return "WM_PICKUP"; - case 0x04C0: return "WM_PENFIRST"; - case 0x04FF: return "WM_PENLAST"; - case 0x0500: return "WM_MMPMFIRST"; - case 0x05FF: return "WM_MMPMLAST"; - case 0x0600: return "WM_STDDLGFIRST"; - case 0x06FF: return "WM_STDDLGLAST"; - case 0x0BD0: return "WM_BIDI_FIRST"; - case 0x0BFF: return "WM_BIDI_LAST"; + case 0x0070: return wxT("WM_MOUSEMOVE"); + case 0x0071: return wxT("WM_BUTTON1DOWN"); + case 0x0072: return wxT("WM_BUTTON1UP"); + case 0x0073: return wxT("WM_BUTTON1DBLCLK"); + case 0x0074: return wxT("WM_BUTTON2DOWN"); + case 0x0075: return wxT("WM_BUTTON2UP"); + case 0x0076: return wxT("WM_BUTTON2DBLCLK"); + case 0x0077: return wxT("WM_BUTTON3DOWN"); + case 0x0078: return wxT("WM_BUTTON3UP"); + case 0x0079: return wxT("WM_BUTTON3DBLCLK"); + case 0x007D: return wxT("WM_MOUSEMAP"); + case 0x007E: return wxT("WM_VRNDISABLED"); + case 0x007F: return wxT("WM_VRNENABLED"); + case 0x0410: return wxT("WM_CHORD"); + case 0x0411: return wxT("WM_BUTTON1MOTIONSTART"); + case 0x0412: return wxT("WM_BUTTON1MOTIONEND"); + case 0x0413: return wxT("WM_BUTTON1CLICK"); + case 0x0414: return wxT("WM_BUTTON2MOTIONSTART"); + case 0x0415: return wxT("WM_BUTTON2MOTIONEND"); + case 0x0416: return wxT("WM_BUTTON2CLICK"); + case 0x0417: return wxT("WM_BUTTON3MOTIONSTART"); + case 0x0418: return wxT("WM_BUTTON3MOTIONEND"); + case 0x0419: return wxT("WM_BUTTON3CLICK"); + case 0x0420: return wxT("WM_BEGINDRAG"); + case 0x0421: return wxT("WM_ENDDRAG"); + case 0x0422: return wxT("WM_SINGLESELECT"); + case 0x0423: return wxT("WM_OPEN"); + case 0x0424: return wxT("WM_CONTEXTMENU"); + case 0x0425: return wxT("WM_CONTEXTHELP"); + case 0x0426: return wxT("WM_TEXTEDIT"); + case 0x0427: return wxT("WM_BEGINSELECT"); + case 0x0228: return wxT("WM_ENDSELECT"); + case 0x0429: return wxT("WM_PICKUP"); + case 0x04C0: return wxT("WM_PENFIRST"); + case 0x04FF: return wxT("WM_PENLAST"); + case 0x0500: return wxT("WM_MMPMFIRST"); + case 0x05FF: return wxT("WM_MMPMLAST"); + case 0x0600: return wxT("WM_STDDLGFIRST"); + case 0x06FF: return wxT("WM_STDDLGLAST"); + case 0x0BD0: return wxT("WM_BIDI_FIRST"); + case 0x0BFF: return wxT("WM_BIDI_LAST"); // keyboard input - case 0x007A: return "WM_CHAR"; - case 0x007B: return "WM_VIOCHAR"; + case 0x007A: return wxT("WM_CHAR"); + case 0x007B: return wxT("WM_VIOCHAR"); // DDE messages - case 0x00A0: return "WM_DDE_INITIATE"; - case 0x00A1: return "WM_DDE_REQUEST"; - case 0x00A2: return "WM_DDE_ACK"; - case 0x00A3: return "WM_DDE_DATA"; - case 0x00A4: return "WM_DDE_ADVISE"; - case 0x00A5: return "WM_DDE_UNADVISE"; - case 0x00A6: return "WM_DDE_POKE"; - case 0x00A7: return "WM_DDE_EXECUTE"; - case 0x00A8: return "WM_DDE_TERMINATE"; - case 0x00A9: return "WM_DDE_INITIATEACK"; - case 0x00AF: return "WM_DDE_LAST"; + case 0x00A0: return wxT("WM_DDE_INITIATE"); + case 0x00A1: return wxT("WM_DDE_REQUEST"); + case 0x00A2: return wxT("WM_DDE_ACK"); + case 0x00A3: return wxT("WM_DDE_DATA"); + case 0x00A4: return wxT("WM_DDE_ADVISE"); + case 0x00A5: return wxT("WM_DDE_UNADVISE"); + case 0x00A6: return wxT("WM_DDE_POKE"); + case 0x00A7: return wxT("WM_DDE_EXECUTE"); + case 0x00A8: return wxT("WM_DDE_TERMINATE"); + case 0x00A9: return wxT("WM_DDE_INITIATEACK"); + case 0x00AF: return wxT("WM_DDE_LAST"); // Buttons - case 0x0120: return "BM_CLICK"; - case 0x0121: return "BM_QUERYCHECKINDEX"; - case 0x0122: return "BM_QUERYHILITE"; - case 0x0123: return "BM_SETHILITE"; - case 0x0124: return "BM_QUERYCHECK"; - case 0x0125: return "BM_SETCHECK"; - case 0x0126: return "BM_SETDEFAULT"; - case 0x0128: return "BM_AUTOSIZE"; + case 0x0120: return wxT("BM_CLICK"); + case 0x0121: return wxT("BM_QUERYCHECKINDEX"); + case 0x0122: return wxT("BM_QUERYHILITE"); + case 0x0123: return wxT("BM_SETHILITE"); + case 0x0124: return wxT("BM_QUERYCHECK"); + case 0x0125: return wxT("BM_SETCHECK"); + case 0x0126: return wxT("BM_SETDEFAULT"); + case 0x0128: return wxT("BM_AUTOSIZE"); // Combo boxes - case 0x029A: return "CBID_LIST"; - case 0x029B: return "CBID_EDIT"; - case 0x0170: return "CBM_SHOWLIST"; - case 0x0171: return "CBM_HILITE"; - case 0x0172: return "CBM_ISLISTSHOWING"; + case 0x029A: return wxT("CBID_LIST"); + case 0x029B: return wxT("CBID_EDIT"); + case 0x0170: return wxT("CBM_SHOWLIST"); + case 0x0171: return wxT("CBM_HILITE"); + case 0x0172: return wxT("CBM_ISLISTSHOWING"); // Edit fields - case 0x0140: return "EM_QUERYCHANGED"; - case 0x0141: return "EM_QUERYSEL"; - case 0x0142: return "EM_SETSEL"; - case 0x0143: return "EM_SETTEXTLIMIT"; - case 0x0144: return "EM_CUT"; - case 0x0145: return "EM_COPY"; - case 0x0146: return "EM_CLEAR"; - case 0x0147: return "EM_PASTE"; - case 0x0148: return "EM_QUERYFIRSTCHAR"; - case 0x0149: return "EM_SETFIRSTCHAR"; - case 0x014A: return "EM_QUERYREADONLY"; - case 0x014B: return "EM_SETREADONLY"; - case 0x014C: return "EM_SETINSERTMODE"; + case 0x0140: return wxT("EM_QUERYCHANGED"); + case 0x0141: return wxT("EM_QUERYSEL"); + case 0x0142: return wxT("EM_SETSEL"); + case 0x0143: return wxT("EM_SETTEXTLIMIT"); + case 0x0144: return wxT("EM_CUT"); + case 0x0145: return wxT("EM_COPY"); + case 0x0146: return wxT("EM_CLEAR"); + case 0x0147: return wxT("EM_PASTE"); + case 0x0148: return wxT("EM_QUERYFIRSTCHAR"); + case 0x0149: return wxT("EM_SETFIRSTCHAR"); + case 0x014A: return wxT("EM_QUERYREADONLY"); + case 0x014B: return wxT("EM_SETREADONLY"); + case 0x014C: return wxT("EM_SETINSERTMODE"); // Listboxes - case 0x0160: return "LM_QUERYITEMCOUNT"; - case 0x0161: return "LM_INSERTITEM"; - case 0x0162: return "LM_SETOPENINDEX"; - case 0x0163: return "LM_DELETEITEM"; - case 0x0164: return "LM_SELECTITEM"; - case 0x0165: return "LM_QUERYSELECTION"; - case 0x0166: return "LM_SETITEMTEXT"; - case 0x0167: return "LM_QUERYITEMTEXTLENGTH"; - case 0x0168: return "LM_QUERYITEMTEXT"; - case 0x0169: return "LM_SETITEMHANDLE"; - case 0x016A: return "LM_QUERYITEMHANDLE"; - case 0x016B: return "LM_SEARCHSTRING"; - case 0x016C: return "LM_SETITEMHEIGHT"; - case 0x016D: return "LM_QUERYTOPINDEX"; - case 0x016E: return "LM_DELETEALL"; - case 0x016F: return "LM_INSERTMULITEMS"; - case 0x0660: return "LM_SETITEMWIDTH"; + case 0x0160: return wxT("LM_QUERYITEMCOUNT"); + case 0x0161: return wxT("LM_INSERTITEM"); + case 0x0162: return wxT("LM_SETOPENINDEX"); + case 0x0163: return wxT("LM_DELETEITEM"); + case 0x0164: return wxT("LM_SELECTITEM"); + case 0x0165: return wxT("LM_QUERYSELECTION"); + case 0x0166: return wxT("LM_SETITEMTEXT"); + case 0x0167: return wxT("LM_QUERYITEMTEXTLENGTH"); + case 0x0168: return wxT("LM_QUERYITEMTEXT"); + case 0x0169: return wxT("LM_SETITEMHANDLE"); + case 0x016A: return wxT("LM_QUERYITEMHANDLE"); + case 0x016B: return wxT("LM_SEARCHSTRING"); + case 0x016C: return wxT("LM_SETITEMHEIGHT"); + case 0x016D: return wxT("LM_QUERYTOPINDEX"); + case 0x016E: return wxT("LM_DELETEALL"); + case 0x016F: return wxT("LM_INSERTMULITEMS"); + case 0x0660: return wxT("LM_SETITEMWIDTH"); // Menus - case 0x0180: return "MM_INSERTITEM"; - case 0x0181: return "MM_DELETEITEM"; - case 0x0182: return "MM_QUERYITEM"; - case 0x0183: return "MM_SETITEM"; - case 0x0184: return "MM_QUERYITEMCOUNT"; - case 0x0185: return "MM_STARTMENUMODE"; - case 0x0186: return "MM_ENDMENUMODE"; - case 0x0188: return "MM_REMOVEITEM"; - case 0x0189: return "MM_SELECTITEM"; - case 0x018A: return "MM_QUERYSELITEMID"; - case 0x018B: return "MM_QUERYITEMTEXT"; - case 0x018C: return "MM_QUERYITEMTEXTLENGTH"; - case 0x018D: return "MM_SETITEMHANDLE"; - case 0x018E: return "MM_SETITEMTEXT"; - case 0x018F: return "MM_ITEMPOSITIONFROMID"; - case 0x0190: return "MM_ITEMIDFROMPOSITION"; - case 0x0191: return "MM_QUERYITEMATTR"; - case 0x0192: return "MM_SETITEMATTR"; - case 0x0193: return "MM_ISITEMVALID"; - case 0x0194: return "MM_QUERYITEMRECT"; - case 0x0431: return "MM_QUERYDEFAULTITEMID"; - case 0x0432: return "MM_SETDEFAULTITEMID"; + case 0x0180: return wxT("MM_INSERTITEM"); + case 0x0181: return wxT("MM_DELETEITEM"); + case 0x0182: return wxT("MM_QUERYITEM"); + case 0x0183: return wxT("MM_SETITEM"); + case 0x0184: return wxT("MM_QUERYITEMCOUNT"); + case 0x0185: return wxT("MM_STARTMENUMODE"); + case 0x0186: return wxT("MM_ENDMENUMODE"); + case 0x0188: return wxT("MM_REMOVEITEM"); + case 0x0189: return wxT("MM_SELECTITEM"); + case 0x018A: return wxT("MM_QUERYSELITEMID"); + case 0x018B: return wxT("MM_QUERYITEMTEXT"); + case 0x018C: return wxT("MM_QUERYITEMTEXTLENGTH"); + case 0x018D: return wxT("MM_SETITEMHANDLE"); + case 0x018E: return wxT("MM_SETITEMTEXT"); + case 0x018F: return wxT("MM_ITEMPOSITIONFROMID"); + case 0x0190: return wxT("MM_ITEMIDFROMPOSITION"); + case 0x0191: return wxT("MM_QUERYITEMATTR"); + case 0x0192: return wxT("MM_SETITEMATTR"); + case 0x0193: return wxT("MM_ISITEMVALID"); + case 0x0194: return wxT("MM_QUERYITEMRECT"); + case 0x0431: return wxT("MM_QUERYDEFAULTITEMID"); + case 0x0432: return wxT("MM_SETDEFAULTITEMID"); // Scrollbars - case 0x01A0: return "SBM_SETSCROLLBAR"; - case 0x01A1: return "SBM_SETPOS"; - case 0x01A2: return "SBM_QUERYPOS"; - case 0x01A3: return "SBM_QUERYRANGE"; - case 0x01A6: return "SBM_SETTHUMBSIZE"; + case 0x01A0: return wxT("SBM_SETSCROLLBAR"); + case 0x01A1: return wxT("SBM_SETPOS"); + case 0x01A2: return wxT("SBM_QUERYPOS"); + case 0x01A3: return wxT("SBM_QUERYRANGE"); + case 0x01A6: return wxT("SBM_SETTHUMBSIZE"); // Help messages - case 0x0F00: return "WM_HELPBASE"; - case 0x0FFF: return "WM_HELPTOP"; + case 0x0F00: return wxT("WM_HELPBASE"); + case 0x0FFF: return wxT("WM_HELPTOP"); // Beginning of user defined messages - case 0x1000: return "WM_USER"; + case 0x1000: return wxT("WM_USER"); - // wxWindows user defined types + // wxWidgets user defined types // listview - // case 0x1000 + 0: return "LVM_GETBKCOLOR"; - case 0x1000 + 1: return "LVM_SETBKCOLOR"; - case 0x1000 + 2: return "LVM_GETIMAGELIST"; - case 0x1000 + 3: return "LVM_SETIMAGELIST"; - case 0x1000 + 4: return "LVM_GETITEMCOUNT"; - case 0x1000 + 5: return "LVM_GETITEMA"; - case 0x1000 + 75: return "LVM_GETITEMW"; - case 0x1000 + 6: return "LVM_SETITEMA"; - case 0x1000 + 76: return "LVM_SETITEMW"; - case 0x1000 + 7: return "LVM_INSERTITEMA"; - case 0x1000 + 77: return "LVM_INSERTITEMW"; - case 0x1000 + 8: return "LVM_DELETEITEM"; - case 0x1000 + 9: return "LVM_DELETEALLITEMS"; - case 0x1000 + 10: return "LVM_GETCALLBACKMASK"; - case 0x1000 + 11: return "LVM_SETCALLBACKMASK"; - case 0x1000 + 12: return "LVM_GETNEXTITEM"; - case 0x1000 + 13: return "LVM_FINDITEMA"; - case 0x1000 + 83: return "LVM_FINDITEMW"; - case 0x1000 + 14: return "LVM_GETITEMRECT"; - case 0x1000 + 15: return "LVM_SETITEMPOSITION"; - case 0x1000 + 16: return "LVM_GETITEMPOSITION"; - case 0x1000 + 17: return "LVM_GETSTRINGWIDTHA"; - case 0x1000 + 87: return "LVM_GETSTRINGWIDTHW"; - case 0x1000 + 18: return "LVM_HITTEST"; - case 0x1000 + 19: return "LVM_ENSUREVISIBLE"; - case 0x1000 + 20: return "LVM_SCROLL"; - case 0x1000 + 21: return "LVM_REDRAWITEMS"; - case 0x1000 + 22: return "LVM_ARRANGE"; - case 0x1000 + 23: return "LVM_EDITLABELA"; - case 0x1000 + 118: return "LVM_EDITLABELW"; - case 0x1000 + 24: return "LVM_GETEDITCONTROL"; - case 0x1000 + 25: return "LVM_GETCOLUMNA"; - case 0x1000 + 95: return "LVM_GETCOLUMNW"; - case 0x1000 + 26: return "LVM_SETCOLUMNA"; - case 0x1000 + 96: return "LVM_SETCOLUMNW"; - case 0x1000 + 27: return "LVM_INSERTCOLUMNA"; - case 0x1000 + 97: return "LVM_INSERTCOLUMNW"; - case 0x1000 + 28: return "LVM_DELETECOLUMN"; - case 0x1000 + 29: return "LVM_GETCOLUMNWIDTH"; - case 0x1000 + 30: return "LVM_SETCOLUMNWIDTH"; - case 0x1000 + 31: return "LVM_GETHEADER"; - case 0x1000 + 33: return "LVM_CREATEDRAGIMAGE"; - case 0x1000 + 34: return "LVM_GETVIEWRECT"; - case 0x1000 + 35: return "LVM_GETTEXTCOLOR"; - case 0x1000 + 36: return "LVM_SETTEXTCOLOR"; - case 0x1000 + 37: return "LVM_GETTEXTBKCOLOR"; - case 0x1000 + 38: return "LVM_SETTEXTBKCOLOR"; - case 0x1000 + 39: return "LVM_GETTOPINDEX"; - case 0x1000 + 40: return "LVM_GETCOUNTPERPAGE"; - case 0x1000 + 41: return "LVM_GETORIGIN"; - case 0x1000 + 42: return "LVM_UPDATE"; - case 0x1000 + 43: return "LVM_SETITEMSTATE"; - case 0x1000 + 44: return "LVM_GETITEMSTATE"; - case 0x1000 + 45: return "LVM_GETITEMTEXTA"; - case 0x1000 + 115: return "LVM_GETITEMTEXTW"; - case 0x1000 + 46: return "LVM_SETITEMTEXTA"; - case 0x1000 + 116: return "LVM_SETITEMTEXTW"; - case 0x1000 + 47: return "LVM_SETITEMCOUNT"; - case 0x1000 + 48: return "LVM_SORTITEMS"; - case 0x1000 + 49: return "LVM_SETITEMPOSITION32"; - case 0x1000 + 50: return "LVM_GETSELECTEDCOUNT"; - case 0x1000 + 51: return "LVM_GETITEMSPACING"; - case 0x1000 + 52: return "LVM_GETISEARCHSTRINGA"; - case 0x1000 + 117: return "LVM_GETISEARCHSTRINGW"; - case 0x1000 + 53: return "LVM_SETICONSPACING"; - case 0x1000 + 54: return "LVM_SETEXTENDEDLISTVIEWSTYLE"; - case 0x1000 + 55: return "LVM_GETEXTENDEDLISTVIEWSTYLE"; - case 0x1000 + 56: return "LVM_GETSUBITEMRECT"; - case 0x1000 + 57: return "LVM_SUBITEMHITTEST"; - case 0x1000 + 58: return "LVM_SETCOLUMNORDERARRAY"; - case 0x1000 + 59: return "LVM_GETCOLUMNORDERARRAY"; - case 0x1000 + 60: return "LVM_SETHOTITEM"; - case 0x1000 + 61: return "LVM_GETHOTITEM"; - case 0x1000 + 62: return "LVM_SETHOTCURSOR"; - case 0x1000 + 63: return "LVM_GETHOTCURSOR"; - case 0x1000 + 64: return "LVM_APPROXIMATEVIEWRECT"; - case 0x1000 + 65: return "LVM_SETWORKAREA"; + // case 0x1000 + 0: return wxT("LVM_GETBKCOLOR"); + case 0x1000 + 1: return wxT("LVM_SETBKCOLOR"); + case 0x1000 + 2: return wxT("LVM_GETIMAGELIST"); + case 0x1000 + 3: return wxT("LVM_SETIMAGELIST"); + case 0x1000 + 4: return wxT("LVM_GETITEMCOUNT"); + case 0x1000 + 5: return wxT("LVM_GETITEMA"); + case 0x1000 + 75: return wxT("LVM_GETITEMW"); + case 0x1000 + 6: return wxT("LVM_SETITEMA"); + case 0x1000 + 76: return wxT("LVM_SETITEMW"); + case 0x1000 + 7: return wxT("LVM_INSERTITEMA"); + case 0x1000 + 77: return wxT("LVM_INSERTITEMW"); + case 0x1000 + 8: return wxT("LVM_DELETEITEM"); + case 0x1000 + 9: return wxT("LVM_DELETEALLITEMS"); + case 0x1000 + 10: return wxT("LVM_GETCALLBACKMASK"); + case 0x1000 + 11: return wxT("LVM_SETCALLBACKMASK"); + case 0x1000 + 12: return wxT("LVM_GETNEXTITEM"); + case 0x1000 + 13: return wxT("LVM_FINDITEMA"); + case 0x1000 + 83: return wxT("LVM_FINDITEMW"); + case 0x1000 + 14: return wxT("LVM_GETITEMRECT"); + case 0x1000 + 15: return wxT("LVM_SETITEMPOSITION"); + case 0x1000 + 16: return wxT("LVM_GETITEMPOSITION"); + case 0x1000 + 17: return wxT("LVM_GETSTRINGWIDTHA"); + case 0x1000 + 87: return wxT("LVM_GETSTRINGWIDTHW"); + case 0x1000 + 18: return wxT("LVM_HITTEST"); + case 0x1000 + 19: return wxT("LVM_ENSUREVISIBLE"); + case 0x1000 + 20: return wxT("LVM_SCROLL"); + case 0x1000 + 21: return wxT("LVM_REDRAWITEMS"); + case 0x1000 + 22: return wxT("LVM_ARRANGE"); + case 0x1000 + 23: return wxT("LVM_EDITLABELA"); + case 0x1000 + 118: return wxT("LVM_EDITLABELW"); + case 0x1000 + 24: return wxT("LVM_GETEDITCONTROL"); + case 0x1000 + 25: return wxT("LVM_GETCOLUMNA"); + case 0x1000 + 95: return wxT("LVM_GETCOLUMNW"); + case 0x1000 + 26: return wxT("LVM_SETCOLUMNA"); + case 0x1000 + 96: return wxT("LVM_SETCOLUMNW"); + case 0x1000 + 27: return wxT("LVM_INSERTCOLUMNA"); + case 0x1000 + 97: return wxT("LVM_INSERTCOLUMNW"); + case 0x1000 + 28: return wxT("LVM_DELETECOLUMN"); + case 0x1000 + 29: return wxT("LVM_GETCOLUMNWIDTH"); + case 0x1000 + 30: return wxT("LVM_SETCOLUMNWIDTH"); + case 0x1000 + 31: return wxT("LVM_GETHEADER"); + case 0x1000 + 33: return wxT("LVM_CREATEDRAGIMAGE"); + case 0x1000 + 34: return wxT("LVM_GETVIEWRECT"); + case 0x1000 + 35: return wxT("LVM_GETTEXTCOLOR"); + case 0x1000 + 36: return wxT("LVM_SETTEXTCOLOR"); + case 0x1000 + 37: return wxT("LVM_GETTEXTBKCOLOR"); + case 0x1000 + 38: return wxT("LVM_SETTEXTBKCOLOR"); + case 0x1000 + 39: return wxT("LVM_GETTOPINDEX"); + case 0x1000 + 40: return wxT("LVM_GETCOUNTPERPAGE"); + case 0x1000 + 41: return wxT("LVM_GETORIGIN"); + case 0x1000 + 42: return wxT("LVM_UPDATE"); + case 0x1000 + 43: return wxT("LVM_SETITEMSTATE"); + case 0x1000 + 44: return wxT("LVM_GETITEMSTATE"); + case 0x1000 + 45: return wxT("LVM_GETITEMTEXTA"); + case 0x1000 + 115: return wxT("LVM_GETITEMTEXTW"); + case 0x1000 + 46: return wxT("LVM_SETITEMTEXTA"); + case 0x1000 + 116: return wxT("LVM_SETITEMTEXTW"); + case 0x1000 + 47: return wxT("LVM_SETITEMCOUNT"); + case 0x1000 + 48: return wxT("LVM_SORTITEMS"); + case 0x1000 + 49: return wxT("LVM_SETITEMPOSITION32"); + case 0x1000 + 50: return wxT("LVM_GETSELECTEDCOUNT"); + case 0x1000 + 51: return wxT("LVM_GETITEMSPACING"); + case 0x1000 + 52: return wxT("LVM_GETISEARCHSTRINGA"); + case 0x1000 + 117: return wxT("LVM_GETISEARCHSTRINGW"); + case 0x1000 + 53: return wxT("LVM_SETICONSPACING"); + case 0x1000 + 54: return wxT("LVM_SETEXTENDEDLISTVIEWSTYLE"); + case 0x1000 + 55: return wxT("LVM_GETEXTENDEDLISTVIEWSTYLE"); + case 0x1000 + 56: return wxT("LVM_GETSUBITEMRECT"); + case 0x1000 + 57: return wxT("LVM_SUBITEMHITTEST"); + case 0x1000 + 58: return wxT("LVM_SETCOLUMNORDERARRAY"); + case 0x1000 + 59: return wxT("LVM_GETCOLUMNORDERARRAY"); + case 0x1000 + 60: return wxT("LVM_SETHOTITEM"); + case 0x1000 + 61: return wxT("LVM_GETHOTITEM"); + case 0x1000 + 62: return wxT("LVM_SETHOTCURSOR"); + case 0x1000 + 63: return wxT("LVM_GETHOTCURSOR"); + case 0x1000 + 64: return wxT("LVM_APPROXIMATEVIEWRECT"); + case 0x1000 + 65: return wxT("LVM_SETWORKAREA"); // tree view - case 0x1100 + 0: return "TVM_INSERTITEMA"; - case 0x1100 + 50: return "TVM_INSERTITEMW"; - case 0x1100 + 1: return "TVM_DELETEITEM"; - case 0x1100 + 2: return "TVM_EXPAND"; - case 0x1100 + 4: return "TVM_GETITEMRECT"; - case 0x1100 + 5: return "TVM_GETCOUNT"; - case 0x1100 + 6: return "TVM_GETINDENT"; - case 0x1100 + 7: return "TVM_SETINDENT"; - case 0x1100 + 8: return "TVM_GETIMAGELIST"; - case 0x1100 + 9: return "TVM_SETIMAGELIST"; - case 0x1100 + 10: return "TVM_GETNEXTITEM"; - case 0x1100 + 11: return "TVM_SELECTITEM"; - case 0x1100 + 12: return "TVM_GETITEMA"; - case 0x1100 + 62: return "TVM_GETITEMW"; - case 0x1100 + 13: return "TVM_SETITEMA"; - case 0x1100 + 63: return "TVM_SETITEMW"; - case 0x1100 + 14: return "TVM_EDITLABELA"; - case 0x1100 + 65: return "TVM_EDITLABELW"; - case 0x1100 + 15: return "TVM_GETEDITCONTROL"; - case 0x1100 + 16: return "TVM_GETVISIBLECOUNT"; - case 0x1100 + 17: return "TVM_HITTEST"; - case 0x1100 + 18: return "TVM_CREATEDRAGIMAGE"; - case 0x1100 + 19: return "TVM_SORTCHILDREN"; - case 0x1100 + 20: return "TVM_ENSUREVISIBLE"; - case 0x1100 + 21: return "TVM_SORTCHILDRENCB"; - case 0x1100 + 22: return "TVM_ENDEDITLABELNOW"; - case 0x1100 + 23: return "TVM_GETISEARCHSTRINGA"; - case 0x1100 + 64: return "TVM_GETISEARCHSTRINGW"; - case 0x1100 + 24: return "TVM_SETTOOLTIPS"; - case 0x1100 + 25: return "TVM_GETTOOLTIPS"; + case 0x1100 + 0: return wxT("TVM_INSERTITEMA"); + case 0x1100 + 50: return wxT("TVM_INSERTITEMW"); + case 0x1100 + 1: return wxT("TVM_DELETEITEM"); + case 0x1100 + 2: return wxT("TVM_EXPAND"); + case 0x1100 + 4: return wxT("TVM_GETITEMRECT"); + case 0x1100 + 5: return wxT("TVM_GETCOUNT"); + case 0x1100 + 6: return wxT("TVM_GETINDENT"); + case 0x1100 + 7: return wxT("TVM_SETINDENT"); + case 0x1100 + 8: return wxT("TVM_GETIMAGELIST"); + case 0x1100 + 9: return wxT("TVM_SETIMAGELIST"); + case 0x1100 + 10: return wxT("TVM_GETNEXTITEM"); + case 0x1100 + 11: return wxT("TVM_SELECTITEM"); + case 0x1100 + 12: return wxT("TVM_GETITEMA"); + case 0x1100 + 62: return wxT("TVM_GETITEMW"); + case 0x1100 + 13: return wxT("TVM_SETITEMA"); + case 0x1100 + 63: return wxT("TVM_SETITEMW"); + case 0x1100 + 14: return wxT("TVM_EDITLABELA"); + case 0x1100 + 65: return wxT("TVM_EDITLABELW"); + case 0x1100 + 15: return wxT("TVM_GETEDITCONTROL"); + case 0x1100 + 16: return wxT("TVM_GETVISIBLECOUNT"); + case 0x1100 + 17: return wxT("TVM_HITTEST"); + case 0x1100 + 18: return wxT("TVM_CREATEDRAGIMAGE"); + case 0x1100 + 19: return wxT("TVM_SORTCHILDREN"); + case 0x1100 + 20: return wxT("TVM_ENSUREVISIBLE"); + case 0x1100 + 21: return wxT("TVM_SORTCHILDRENCB"); + case 0x1100 + 22: return wxT("TVM_ENDEDITLABELNOW"); + case 0x1100 + 23: return wxT("TVM_GETISEARCHSTRINGA"); + case 0x1100 + 64: return wxT("TVM_GETISEARCHSTRINGW"); + case 0x1100 + 24: return wxT("TVM_SETTOOLTIPS"); + case 0x1100 + 25: return wxT("TVM_GETTOOLTIPS"); // header - case 0x1200 + 0: return "HDM_GETITEMCOUNT"; - case 0x1200 + 1: return "HDM_INSERTITEMA"; - case 0x1200 + 10: return "HDM_INSERTITEMW"; - case 0x1200 + 2: return "HDM_DELETEITEM"; - case 0x1200 + 3: return "HDM_GETITEMA"; - case 0x1200 + 11: return "HDM_GETITEMW"; - case 0x1200 + 4: return "HDM_SETITEMA"; - case 0x1200 + 12: return "HDM_SETITEMW"; - case 0x1200 + 5: return "HDM_LAYOUT"; - case 0x1200 + 6: return "HDM_HITTEST"; - case 0x1200 + 7: return "HDM_GETITEMRECT"; - case 0x1200 + 8: return "HDM_SETIMAGELIST"; - case 0x1200 + 9: return "HDM_GETIMAGELIST"; - case 0x1200 + 15: return "HDM_ORDERTOINDEX"; - case 0x1200 + 16: return "HDM_CREATEDRAGIMAGE"; - case 0x1200 + 17: return "HDM_GETORDERARRAY"; - case 0x1200 + 18: return "HDM_SETORDERARRAY"; - case 0x1200 + 19: return "HDM_SETHOTDIVIDER"; + case 0x1200 + 0: return wxT("HDM_GETITEMCOUNT"); + case 0x1200 + 1: return wxT("HDM_INSERTITEMA"); + case 0x1200 + 10: return wxT("HDM_INSERTITEMW"); + case 0x1200 + 2: return wxT("HDM_DELETEITEM"); + case 0x1200 + 3: return wxT("HDM_GETITEMA"); + case 0x1200 + 11: return wxT("HDM_GETITEMW"); + case 0x1200 + 4: return wxT("HDM_SETITEMA"); + case 0x1200 + 12: return wxT("HDM_SETITEMW"); + case 0x1200 + 5: return wxT("HDM_LAYOUT"); + case 0x1200 + 6: return wxT("HDM_HITTEST"); + case 0x1200 + 7: return wxT("HDM_GETITEMRECT"); + case 0x1200 + 8: return wxT("HDM_SETIMAGELIST"); + case 0x1200 + 9: return wxT("HDM_GETIMAGELIST"); + case 0x1200 + 15: return wxT("HDM_ORDERTOINDEX"); + case 0x1200 + 16: return wxT("HDM_CREATEDRAGIMAGE"); + case 0x1200 + 17: return wxT("HDM_GETORDERARRAY"); + case 0x1200 + 18: return wxT("HDM_SETORDERARRAY"); + case 0x1200 + 19: return wxT("HDM_SETHOTDIVIDER"); // tab control - case 0x1300 + 2: return "TCM_GETIMAGELIST"; - case 0x1300 + 3: return "TCM_SETIMAGELIST"; - case 0x1300 + 4: return "TCM_GETITEMCOUNT"; - case 0x1300 + 5: return "TCM_GETITEMA"; - case 0x1300 + 60: return "TCM_GETITEMW"; - case 0x1300 + 6: return "TCM_SETITEMA"; - case 0x1300 + 61: return "TCM_SETITEMW"; - case 0x1300 + 7: return "TCM_INSERTITEMA"; - case 0x1300 + 62: return "TCM_INSERTITEMW"; - case 0x1300 + 8: return "TCM_DELETEITEM"; - case 0x1300 + 9: return "TCM_DELETEALLITEMS"; - case 0x1300 + 10: return "TCM_GETITEMRECT"; - case 0x1300 + 11: return "TCM_GETCURSEL"; - case 0x1300 + 12: return "TCM_SETCURSEL"; - case 0x1300 + 13: return "TCM_HITTEST"; - case 0x1300 + 14: return "TCM_SETITEMEXTRA"; - case 0x1300 + 40: return "TCM_ADJUSTRECT"; - case 0x1300 + 41: return "TCM_SETITEMSIZE"; - case 0x1300 + 42: return "TCM_REMOVEIMAGE"; - case 0x1300 + 43: return "TCM_SETPADDING"; - case 0x1300 + 44: return "TCM_GETROWCOUNT"; - case 0x1300 + 45: return "TCM_GETTOOLTIPS"; - case 0x1300 + 46: return "TCM_SETTOOLTIPS"; - case 0x1300 + 47: return "TCM_GETCURFOCUS"; - case 0x1300 + 48: return "TCM_SETCURFOCUS"; - case 0x1300 + 49: return "TCM_SETMINTABWIDTH"; - case 0x1300 + 50: return "TCM_DESELECTALL"; + case 0x1300 + 2: return wxT("TCM_GETIMAGELIST"); + case 0x1300 + 3: return wxT("TCM_SETIMAGELIST"); + case 0x1300 + 4: return wxT("TCM_GETITEMCOUNT"); + case 0x1300 + 5: return wxT("TCM_GETITEMA"); + case 0x1300 + 60: return wxT("TCM_GETITEMW"); + case 0x1300 + 6: return wxT("TCM_SETITEMA"); + case 0x1300 + 61: return wxT("TCM_SETITEMW"); + case 0x1300 + 7: return wxT("TCM_INSERTITEMA"); + case 0x1300 + 62: return wxT("TCM_INSERTITEMW"); + case 0x1300 + 8: return wxT("TCM_DELETEITEM"); + case 0x1300 + 9: return wxT("TCM_DELETEALLITEMS"); + case 0x1300 + 10: return wxT("TCM_GETITEMRECT"); + case 0x1300 + 11: return wxT("TCM_GETCURSEL"); + case 0x1300 + 12: return wxT("TCM_SETCURSEL"); + case 0x1300 + 13: return wxT("TCM_HITTEST"); + case 0x1300 + 14: return wxT("TCM_SETITEMEXTRA"); + case 0x1300 + 40: return wxT("TCM_ADJUSTRECT"); + case 0x1300 + 41: return wxT("TCM_SETITEMSIZE"); + case 0x1300 + 42: return wxT("TCM_REMOVEIMAGE"); + case 0x1300 + 43: return wxT("TCM_SETPADDING"); + case 0x1300 + 44: return wxT("TCM_GETROWCOUNT"); + case 0x1300 + 45: return wxT("TCM_GETTOOLTIPS"); + case 0x1300 + 46: return wxT("TCM_SETTOOLTIPS"); + case 0x1300 + 47: return wxT("TCM_GETCURFOCUS"); + case 0x1300 + 48: return wxT("TCM_SETCURFOCUS"); + case 0x1300 + 49: return wxT("TCM_SETMINTABWIDTH"); + case 0x1300 + 50: return wxT("TCM_DESELECTALL"); // toolbar - case WM_USER+1000+1: return "TB_ENABLEBUTTON"; - case WM_USER+1000+2: return "TB_CHECKBUTTON"; - case WM_USER+1000+3: return "TB_PRESSBUTTON"; - case WM_USER+1000+4: return "TB_HIDEBUTTON"; - case WM_USER+1000+5: return "TB_INDETERMINATE"; - case WM_USER+1000+9: return "TB_ISBUTTONENABLED"; - case WM_USER+1000+10: return "TB_ISBUTTONCHECKED"; - case WM_USER+1000+11: return "TB_ISBUTTONPRESSED"; - case WM_USER+1000+12: return "TB_ISBUTTONHIDDEN"; - case WM_USER+1000+13: return "TB_ISBUTTONINDETERMINATE"; - case WM_USER+1000+17: return "TB_SETSTATE"; - case WM_USER+1000+18: return "TB_GETSTATE"; - case WM_USER+1000+19: return "TB_ADDBITMAP"; - case WM_USER+1000+20: return "TB_ADDBUTTONS"; - case WM_USER+1000+21: return "TB_INSERTBUTTON"; - case WM_USER+1000+22: return "TB_DELETEBUTTON"; - case WM_USER+1000+23: return "TB_GETBUTTON"; - case WM_USER+1000+24: return "TB_BUTTONCOUNT"; - case WM_USER+1000+25: return "TB_COMMANDTOINDEX"; - case WM_USER+1000+26: return "TB_SAVERESTOREA"; - case WM_USER+1000+76: return "TB_SAVERESTOREW"; - case WM_USER+1000+27: return "TB_CUSTOMIZE"; - case WM_USER+1000+28: return "TB_ADDSTRINGA"; - case WM_USER+1000+77: return "TB_ADDSTRINGW"; - case WM_USER+1000+29: return "TB_GETITEMRECT"; - case WM_USER+1000+30: return "TB_BUTTONSTRUCTSIZE"; - case WM_USER+1000+31: return "TB_SETBUTTONSIZE"; - case WM_USER+1000+32: return "TB_SETBITMAPSIZE"; - case WM_USER+1000+33: return "TB_AUTOSIZE"; - case WM_USER+1000+35: return "TB_GETTOOLTIPS"; - case WM_USER+1000+36: return "TB_SETTOOLTIPS"; - case WM_USER+1000+37: return "TB_SETPARENT"; - case WM_USER+1000+39: return "TB_SETROWS"; - case WM_USER+1000+40: return "TB_GETROWS"; - case WM_USER+1000+42: return "TB_SETCMDID"; - case WM_USER+1000+43: return "TB_CHANGEBITMAP"; - case WM_USER+1000+44: return "TB_GETBITMAP"; - case WM_USER+1000+45: return "TB_GETBUTTONTEXTA"; - case WM_USER+1000+75: return "TB_GETBUTTONTEXTW"; - case WM_USER+1000+46: return "TB_REPLACEBITMAP"; - case WM_USER+1000+47: return "TB_SETINDENT"; - case WM_USER+1000+48: return "TB_SETIMAGELIST"; - case WM_USER+1000+49: return "TB_GETIMAGELIST"; - case WM_USER+1000+50: return "TB_LOADIMAGES"; - case WM_USER+1000+51: return "TB_GETRECT"; - case WM_USER+1000+52: return "TB_SETHOTIMAGELIST"; - case WM_USER+1000+53: return "TB_GETHOTIMAGELIST"; - case WM_USER+1000+54: return "TB_SETDISABLEDIMAGELIST"; - case WM_USER+1000+55: return "TB_GETDISABLEDIMAGELIST"; - case WM_USER+1000+56: return "TB_SETSTYLE"; - case WM_USER+1000+57: return "TB_GETSTYLE"; - case WM_USER+1000+58: return "TB_GETBUTTONSIZE"; - case WM_USER+1000+59: return "TB_SETBUTTONWIDTH"; - case WM_USER+1000+60: return "TB_SETMAXTEXTROWS"; - case WM_USER+1000+61: return "TB_GETTEXTROWS"; - case WM_USER+1000+41: return "TB_GETBITMAPFLAGS"; - - default: - static char s_szBuf[128]; - sprintf(s_szBuf, "", nMessage); - return s_szBuf; + case WM_USER+1000+1: return wxT("TB_ENABLEBUTTON"); + case WM_USER+1000+2: return wxT("TB_CHECKBUTTON"); + case WM_USER+1000+3: return wxT("TB_PRESSBUTTON"); + case WM_USER+1000+4: return wxT("TB_HIDEBUTTON"); + case WM_USER+1000+5: return wxT("TB_INDETERMINATE"); + case WM_USER+1000+9: return wxT("TB_ISBUTTONENABLED"); + case WM_USER+1000+10: return wxT("TB_ISBUTTONCHECKED"); + case WM_USER+1000+11: return wxT("TB_ISBUTTONPRESSED"); + case WM_USER+1000+12: return wxT("TB_ISBUTTONHIDDEN"); + case WM_USER+1000+13: return wxT("TB_ISBUTTONINDETERMINATE"); + case WM_USER+1000+17: return wxT("TB_SETSTATE"); + case WM_USER+1000+18: return wxT("TB_GETSTATE"); + case WM_USER+1000+19: return wxT("TB_ADDBITMAP"); + case WM_USER+1000+20: return wxT("TB_ADDBUTTONS"); + case WM_USER+1000+21: return wxT("TB_INSERTBUTTON"); + case WM_USER+1000+22: return wxT("TB_DELETEBUTTON"); + case WM_USER+1000+23: return wxT("TB_GETBUTTON"); + case WM_USER+1000+24: return wxT("TB_BUTTONCOUNT"); + case WM_USER+1000+25: return wxT("TB_COMMANDTOINDEX"); + case WM_USER+1000+26: return wxT("TB_SAVERESTOREA"); + case WM_USER+1000+76: return wxT("TB_SAVERESTOREW"); + case WM_USER+1000+27: return wxT("TB_CUSTOMIZE"); + case WM_USER+1000+28: return wxT("TB_ADDSTRINGA"); + case WM_USER+1000+77: return wxT("TB_ADDSTRINGW"); + case WM_USER+1000+29: return wxT("TB_GETITEMRECT"); + case WM_USER+1000+30: return wxT("TB_BUTTONSTRUCTSIZE"); + case WM_USER+1000+31: return wxT("TB_SETBUTTONSIZE"); + case WM_USER+1000+32: return wxT("TB_SETBITMAPSIZE"); + case WM_USER+1000+33: return wxT("TB_AUTOSIZE"); + case WM_USER+1000+35: return wxT("TB_GETTOOLTIPS"); + case WM_USER+1000+36: return wxT("TB_SETTOOLTIPS"); + case WM_USER+1000+37: return wxT("TB_SETPARENT"); + case WM_USER+1000+39: return wxT("TB_SETROWS"); + case WM_USER+1000+40: return wxT("TB_GETROWS"); + case WM_USER+1000+42: return wxT("TB_SETCMDID"); + case WM_USER+1000+43: return wxT("TB_CHANGEBITMAP"); + case WM_USER+1000+44: return wxT("TB_GETBITMAP"); + case WM_USER+1000+45: return wxT("TB_GETBUTTONTEXTA"); + case WM_USER+1000+75: return wxT("TB_GETBUTTONTEXTW"); + case WM_USER+1000+46: return wxT("TB_REPLACEBITMAP"); + case WM_USER+1000+47: return wxT("TB_SETINDENT"); + case WM_USER+1000+48: return wxT("TB_SETIMAGELIST"); + case WM_USER+1000+49: return wxT("TB_GETIMAGELIST"); + case WM_USER+1000+50: return wxT("TB_LOADIMAGES"); + case WM_USER+1000+51: return wxT("TB_GETRECT"); + case WM_USER+1000+52: return wxT("TB_SETHOTIMAGELIST"); + case WM_USER+1000+53: return wxT("TB_GETHOTIMAGELIST"); + case WM_USER+1000+54: return wxT("TB_SETDISABLEDIMAGELIST"); + case WM_USER+1000+55: return wxT("TB_GETDISABLEDIMAGELIST"); + case WM_USER+1000+56: return wxT("TB_SETSTYLE"); + case WM_USER+1000+57: return wxT("TB_GETSTYLE"); + case WM_USER+1000+58: return wxT("TB_GETBUTTONSIZE"); + case WM_USER+1000+59: return wxT("TB_SETBUTTONWIDTH"); + case WM_USER+1000+60: return wxT("TB_SETMAXTEXTROWS"); + case WM_USER+1000+61: return wxT("TB_GETTEXTROWS"); + case WM_USER+1000+41: return wxT("TB_GETBITMAPFLAGS"); } - return NULL; + + static wxString s_szBuf; + s_szBuf.Printf(wxT(""), nMessage); + return s_szBuf.c_str(); + } // end of wxGetMessageName #endif // __WXDEBUG__ +// Unused? +#if 0 static void TranslateKbdEventToMouse( wxWindow* pWin , int* pX @@ -3967,4 +4963,160 @@ static void TranslateKbdEventToMouse( pWin->ScreenToClient(pX, pY); } // end of TranslateKbdEventToMouse +#endif + +// Find the wxWindow at the current mouse position, returning the mouse +// position. +wxWindow* wxFindWindowAtPointer(wxPoint& WXUNUSED(rPt)) +{ + return wxFindWindowAtPoint(wxGetMousePosition()); +} + +wxWindow* wxFindWindowAtPoint(const wxPoint& rPt) +{ + POINTL vPt2; + + vPt2.x = rPt.x; + vPt2.y = rPt.y; + + HWND hWndHit = ::WinWindowFromPoint(HWND_DESKTOP, &vPt2, FALSE); + wxWindow* pWin = wxFindWinFromHandle((WXHWND)hWndHit) ; + HWND hWnd = hWndHit; + + // + // Try to find a window with a wxWindow associated with it + // + while (!pWin && (hWnd != 0)) + { + hWnd = ::WinQueryWindow(hWnd, QW_PARENT); + pWin = wxFindWinFromHandle((WXHWND)hWnd) ; + } + return pWin; +} + +// Get the current mouse position. +wxPoint wxGetMousePosition() +{ + POINTL vPt; + + ::WinQueryPointerPos(HWND_DESKTOP, &vPt); + return wxPoint(vPt.x, vPt.y); +} + +wxMouseState wxGetMouseState() +{ + wxMouseState ms; + wxPoint pt = wxGetMousePosition(); + ms.SetX(pt.x); + ms.SetY(pt.y); + ms.SetLeftDown(IsKeyDown(VK_BUTTON1)); + ms.SetMiddleDown(IsKeyDown(VK_BUTTON3)); + ms.SetRightDown(IsKeyDown(VK_BUTTON2)); + ms.SetControlDown(IsCtrlDown()); + ms.SetShiftDown(IsShiftDown()); + ms.SetAltDown(IsKeyDown(VK_ALT)|IsKeyDown(VK_ALTGRAF)); + ms.SetMetaDown(IsKeyDown(VK_ALTGRAF)); + return ms; +} + + +wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin, + short* WXUNUSED(pnX), + short* WXUNUSED(pnY) ) +{ + HWND hWnd = GetHwndOf(pWin); + HWND hWndUnderMouse; + POINTL vPoint; + BOOL rcEnabled = FALSE; + BOOL rcVisible = FALSE; + + ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); + hWndUnderMouse = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE); + if (hWndUnderMouse != HWND_DESKTOP) + { + wxWindow* pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse); + if (pWinUnderMouse) + { + wxWindowList::compatibility_iterator current = pWinUnderMouse->GetChildren().GetFirst(); + wxWindow* pGrandChild = NULL; + RECTL vRect; + POINTL vPoint2; + + ::WinMapWindowPoints(HWND_DESKTOP, hWndUnderMouse, &vPoint, 1); + // + // Find a child window mouse might be under + // + while (current) + { + wxWindow* pChild = current->GetData(); + + vPoint2.x = vPoint.x; + vPoint2.y = vPoint.y; + ::WinMapWindowPoints(hWndUnderMouse, pChild->GetHWND(), &vPoint2, 1); + ::WinQueryWindowRect(pChild->GetHWND(), &vRect); + if (::WinPtInRect(vHabmain, &vRect, &vPoint2)) + { + if (pChild->IsTopLevel()) + { + POINTL vPoint3; + wxWindowList::compatibility_iterator current2 =pChild->GetChildren().GetFirst(); + + while (current2) + { + wxWindow* pGrandChild = current2->GetData(); + + vPoint3.x = vPoint2.x; + vPoint3.y = vPoint2.y; + ::WinMapWindowPoints( pChild->GetHWND() + ,pGrandChild->GetHWND() + ,&vPoint3 + ,1 + ); + ::WinQueryWindowRect(pGrandChild->GetHWND(), &vRect); + if (::WinPtInRect(vHabmain, &vRect, &vPoint3)) + { + hWndUnderMouse = GetHwndOf(pGrandChild); + pWinUnderMouse = pGrandChild; + break; + } + current2 = current2->GetNext(); + } + if (pGrandChild) + break; + } + hWndUnderMouse = GetHwndOf(pChild); + pWinUnderMouse = pChild; + rcVisible = ::WinIsWindowVisible(hWndUnderMouse); + rcEnabled = ::WinIsWindowEnabled(hWndUnderMouse); + if (rcVisible && rcEnabled) + break; + } + current = current->GetNext(); + } + } + } + rcVisible = ::WinIsWindowVisible(hWndUnderMouse); + rcEnabled = ::WinIsWindowEnabled(hWndUnderMouse); + + + // + // Check that we have a child window which is susceptible to receive mouse + // events: for this it must be shown and enabled + // + if ( hWndUnderMouse && + hWndUnderMouse != hWnd && + rcVisible && rcEnabled) + { + wxWindow* pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse); + + if (pWinUnderMouse) + { + // + // Translate the mouse coords to the other window coords + // + pWin = pWinUnderMouse; + } + } + return pWin; +} // end of FindWindowForMouseEvent