-// Name: windows.cpp
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/os2/window.cpp
// Purpose: wxWindow
// Author: David Webster
// Modified by:
#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 <stdio.h>
#endif
-#if wxUSE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
#include "wx/tooltip.h"
#endif
+#if wxUSE_NOTEBOOK
+ #include "wx/notebook.h"
+#endif
+
#if wxUSE_CARET
#include "wx/caret.h"
#endif // wxUSE_CARET
wxMenu* wxCurrentPopupMenu = NULL;
#endif // wxUSE_MENUS_NATIVE
-wxList* wxWinHandleList = NULL;
-
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
);
#ifdef __WXDEBUG__
- const char *wxGetMessageName(int message);
+ const wxChar *wxGetMessageName(int message);
#endif //__WXDEBUG__
wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin
BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase)
EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground)
EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged)
- EVT_INIT_DIALOG(wxWindowOS2::OnInitDialog)
EVT_IDLE(wxWindowOS2::OnIdle)
EVT_SET_FOCUS(wxWindowOS2::OnSetFocus)
END_EVENT_TABLE()
}
#endif // wxUSE_CONTROLS
- wxWindowList::Node* pCurrent = GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator current = GetChildren().GetFirst();
- while (pCurrent)
+ while (current)
{
- wxWindow* pChildWin = pCurrent->GetData();
+ wxWindow* pChildWin = current->GetData();
wxWindow* pWnd = pChildWin->FindItem(lId);
if (pWnd)
return pWnd;
- pCurrent = pCurrent->GetNext();
+ current = current->GetNext();
}
return(NULL);
} // end of wxWindowOS2::FindItem
, 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.
#endif // wxUSE_CONTROLS
)
{
- wxWindow* pItem = pCurrent->GetData();
+ wxWindow* pItem = current->GetData();
if (pItem->GetHWND() == hWnd)
return(pItem);
return(pItem);
}
}
- pCurrent = pCurrent->GetNext();
+ current = current->GetNext();
}
return(NULL);
} // end of wxWindowOS2::FindItemByHWND
//
// Default command handler
//
-bool wxWindowOS2::OS2Command(
- WXUINT WXUNUSED(uParam)
-, WXWORD WXUNUSED(uId)
-)
+bool wxWindowOS2::OS2Command( WXUINT WXUNUSED(uParam),
+ WXWORD WXUNUSED(uId) )
{
- return(FALSE);
+ return false;
}
// ----------------------------------------------------------------------------
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_bLastKeydownProcessed = FALSE;
+ m_fnOldWndProc = NULL;
+ m_bUseCtl3D = false;
+ m_bMouseInWindow = false;
+ m_bLastKeydownProcessed = false;
+ m_pChildrenDisabled = NULL;
//
// wxWnd
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 =
//
wxWindowOS2::~wxWindowOS2()
{
- m_isBeingDeleted = TRUE;
+ m_isBeingDeleted = true;
for (wxWindow* pWin = GetParent(); pWin; pWin = pWin->GetParent())
{
- wxFrame* pFrame = wxDynamicCast(pWin, wxFrame);
+ wxTopLevelWindow* pFrame = wxDynamicCast(pWin, wxTopLevelWindow);
if (pFrame)
{
if (pFrame->GetLastFocus() == this)
- pFrame->SetLastFocus((wxWindow*)NULL);
+ pFrame->SetLastFocus(NULL);
}
}
DestroyChildren();
- if (m_parent)
- m_parent->RemoveChild(this);
-
if (m_hWnd)
{
if(!::WinDestroyWindow(GetHWND()))
//
wxRemoveHandleAssociation(this);
}
+ delete m_pChildrenDisabled;
} // 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
-)
+bool wxWindowOS2::Create( wxWindow* pParent,
+ wxWindowID vId,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle,
+ const wxString& rName )
{
- HWND hParent = NULLHANDLE;
- ULONG ulCreateFlags = 0;
- WXDWORD dwExStyle = 0;
+ HWND hParent = NULLHANDLE;
+ ULONG ulCreateFlags = 0;
+ WXDWORD dwExStyle = 0;
- wxCHECK_MSG(pParent, FALSE, wxT("can't create wxWindow without parent"));
+ wxCHECK_MSG(pParent, false, wxT("can't create wxWindow without parent"));
#if wxUSE_STATBOX
//
_T("wxStaticBox can't be used as a window parent!") );
#endif // wxUSE_STATBOX
+ // Ensure groupbox backgrounds are painted
+ if (IsKindOf(CLASSINFO(wxPanel)))
+ lStyle &= ~wxCLIP_CHILDREN;
+
if ( !CreateBase( pParent
,vId
,rPos
,wxDefaultValidator
,rName
))
- return(FALSE);
+ return false;
if (pParent)
{
- int nTempy;
-
pParent->AddChild(this);
hParent = GetWinHwnd(pParent);
- if ( pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)) ||
- pParent->IsKindOf(CLASSINFO(wxScrolledWindow))
- )
+ if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)))
ulCreateFlags |= WS_CLIPSIBLINGS;
}
// set in those class create procs. PM's basic windows styles are
// very limited.
//
- ulCreateFlags |= WS_VISIBLE | OS2GetCreateWindowFlags(&dwExStyle);
+ ulCreateFlags |= OS2GetCreateWindowFlags(&dwExStyle);
#ifdef __WXUNIVERSAL__
#endif // !wxUniversal
if (lStyle & wxPOPUP_WINDOW)
{
- // a popup window floats on top of everything
- // it is also created hidden as other top level windows
ulCreateFlags &= ~WS_VISIBLE;
- m_isShown = FALSE;
+ m_isShown = false;
+ }
+ else
+ {
+ ulCreateFlags |= WS_VISIBLE;
}
//
// Generic OS/2 Windows have no Control Data but other classes
// that call OS2Create may have some.
//
- OS2Create( (PSZ)wxCanvasClassName
- ,rName.c_str()
- ,ulCreateFlags
- ,rPos
- ,rSize
- ,NULL // Control Data
- ,dwExStyle
- ,TRUE // Child
- );
-
- return(TRUE);
+ return(OS2Create( (PSZ)wxCanvasClassName
+ ,rName.c_str()
+ ,ulCreateFlags
+ ,rPos
+ ,rSize
+ ,NULL // Control Data
+ ,dwExStyle
+ ,true // Child
+ ));
} // end of wxWindowOS2::Create
// ---------------------------------------------------------------------------
wxWindowBase::SetFocusFromKbd();
} // end of wxWindowOS2::SetFocus
-wxWindow* wxWindowBase::FindFocus()
+wxWindow* wxWindowBase::DoFindFocus()
{
HWND hWnd = ::WinQueryFocus(HWND_DESKTOP);
return wxFindWinFromHandle((WXHWND)hWnd);
}
return NULL;
-} // wxWindowBase::FindFocus
+} // wxWindowBase::DoFindFocus
-bool wxWindowOS2::Enable(
- bool bEnable
-)
+bool wxWindowOS2::Enable( bool bEnable )
{
if (!wxWindowBase::Enable(bEnable))
- return(FALSE);
+ return false;
HWND hWnd = GetHwnd();
if ( hWnd )
::WinEnableWindow(hWnd, (BOOL)bEnable);
- wxWindowList::Node* pNode = GetChildren().GetFirst();
+ //
+ // The logic below doesn't apply to the top level windows -- otherwise
+ // showing a modal dialog would result in total greying out (and ungreying
+ // out later) of everything which would be really ugly
+ //
+ if (IsTopLevel())
+ return true;
- while (pNode)
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+
+ while (node)
{
- wxWindow* pChild = pNode->GetData();
+ wxWindow* pChild = node->GetData();
- pChild->Enable(bEnable);
- pNode = pNode->GetNext();
+ if (bEnable)
+ {
+ //
+ // Enable the child back unless it had been disabled before us
+ //
+ if (!m_pChildrenDisabled || !m_pChildrenDisabled->Find(pChild))
+ pChild->Enable();
+ }
+ else // we're being disabled
+ {
+ if (pChild->IsEnabled())
+ {
+ //
+ // Disable it as children shouldn't stay enabled while the
+ // parent is not
+ //
+ pChild->Disable();
+ }
+ else // child already disabled, remember it
+ {
+ //
+ // Have we created the list of disabled children already?
+ //
+ if (!m_pChildrenDisabled)
+ m_pChildrenDisabled = new wxWindowList;
+ m_pChildrenDisabled->Append(pChild);
+ }
+ }
+ node = node->GetNext();
+ }
+ if (bEnable && m_pChildrenDisabled)
+ {
+ //
+ // We don't need this list any more, don't keep unused memory
+ //
+ delete m_pChildrenDisabled;
+ m_pChildrenDisabled = NULL;
}
- return TRUE;
+ return true;
} // end of wxWindowOS2::Enable
-bool wxWindowOS2::Show(
- bool bShow
-)
+bool wxWindowOS2::Show( bool bShow )
{
if (!wxWindowBase::Show(bShow))
- return(FALSE);
+ return false;
HWND hWnd = GetHwnd();
{
::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE | SWP_ZORDER);
}
- return TRUE;
+ return true;
} // end of wxWindowOS2::Show
void wxWindowOS2::Raise()
::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER | SWP_DEACTIVATE);
} // end of wxWindowOS2::Lower
-void wxWindowOS2::SetTitle(
- const wxString& rTitle
-)
+void wxWindowOS2::SetLabel( const wxString& label )
{
- ::WinSetWindowText(GetHwnd(), rTitle.c_str());
-} // end of wxWindowOS2::SetTitle
+ ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str());
+} // end of wxWindowOS2::SetLabel
-wxString wxWindowOS2::GetTitle() const
+wxString wxWindowOS2::GetLabel() const
{
return wxGetWindowText(GetHWND());
-} // end of wxWindowOS2::GetTitle
+} // end of wxWindowOS2::GetLabel
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 wxWindowOS2::GetTitle
+} // end of wxWindowOS2::DoCaptureMouse
void wxWindowOS2::DoReleaseMouse()
{
if (m_bWinCaptured)
{
::WinSetCapture(HWND_DESKTOP, NULLHANDLE);
- m_bWinCaptured = FALSE;
+ m_bWinCaptured = false;
}
} // end of wxWindowOS2::ReleaseMouse
return hwnd ? wxFindWinFromHandle((WXHWND)hwnd) : (wxWindow *)NULL;
} // end of wxWindowBase::GetCapture
-bool wxWindowOS2::SetFont(
- const wxFont& rFont
-)
+bool wxWindowOS2::SetFont( const wxFont& rFont )
{
if (!wxWindowBase::SetFont(rFont))
{
// nothing to do
- return(FALSE);
+ return false;
}
- HWND hWnd = GetHwnd();
+ HWND hWnd = GetHwnd();
- wxOS2SetFont( hWnd
- ,rFont
- );
- return(TRUE);
+ wxOS2SetFont( hWnd, rFont );
+ return true;
} // end of wxWindowOS2::SetFont
-bool wxWindowOS2::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;
}
if ( m_cursor.Ok() ) {
::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR());
}
}
- return TRUE;
+ return true;
} // end of wxWindowOS2::SetCursor
void wxWindowOS2::WarpPointer(
::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY));
} // end of wxWindowOS2::WarpPointer
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::OS2DeviceToLogical (float *x, float *y) const
-{
-}
-#endif // WXWIN_COMPATIBILITY
// ---------------------------------------------------------------------------
// scrolling stuff
// ---------------------------------------------------------------------------
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::SetScrollRange(
- int nOrient
-, int nRange
-, bool bRefresh
-)
-{
- int nRange1 = nRange;
- int nPageSize = GetScrollPage(nOrient);
-
- if (nPpageSize > 1 && nRange > 0)
- {
- nRange1 += (nPageSize - 1);
- }
-
- if (nOrient == wxHORIZONTAL)
- {
- ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
- ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
- }
- else
- {
- ::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
- ::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
- }
-} // end of wxWindowOS2::SetScrollRange
-
-void wxWindowOS2::SetScrollPage(
- int nOrient
-, int nPage
-, bool bRefresh
-)
-{
- if (nOrient == wxHORIZONTAL )
- m_nXThumbSize = nPage;
- else
- m_nYThumbSize = nPage;
-} // end of wxWindowOS2::SetScrollPage
-
-int wxWindowOS2::OldGetScrollRange(
- int nOrient
-) const
-{
- MRESULT mRc;
- HWND hWnd = GetHwnd();
-
- if (hWnd)
- {
- mRc = WinSendMsg(hWnd, SBM_QUERYRANGE, (MPARAM)0L, (MPARAM)0L);
- return(SHORT2FROMMR(mRc));
- }
- return 0;
-} // end of wxWindowOS2::OldGetScrollRange
-
-int wxWindowOS2::GetScrollPage(
- int nOrient
-) const
-{
- if (nOrient == wxHORIZONTAL)
- return m_nXThumbSize;
- else
- return m_nYThumbSize;
-} // end of wxWindowOS2::GetScrollPage
-#endif // WXWIN_COMPATIBILITY
-
int wxWindowOS2::GetScrollPos(
int nOrient
) const
::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)
-)
+void wxWindowOS2::SetScrollbar( int nOrient,
+ int nPos,
+ int nThumbVisible,
+ int nRange,
+ bool WXUNUSED(bRefresh) )
{
HWND hWnd = GetHwnd();
int nOldRange = nRange - nThumbVisible;
ULONG ulStyle = WS_VISIBLE | WS_SYNCPAINT;
SWP vSwp;
SWP vSwpOwner;
- RECTL vRect;
HWND hWndParent;
HWND hWndClient;
wxWindow* pParent = GetParent();
vInfo.cb = sizeof(SBCDATA);
vInfo.posFirst = 0;
vInfo.posLast = (SHORT)nRange1;
- vInfo.posThumb = nPos;
+ vInfo.posThumb = (SHORT)nPos;
if (nOrient == wxHORIZONTAL )
{
}
} // end of wxWindowOS2::SetScrollbar
-void wxWindowOS2::ScrollWindow(
- int nDx
-, int nDy
-, const wxRect* pRect
-)
+
+void wxWindowOS2::ScrollWindow( int nDx,
+ int nDy,
+ const wxRect* pRect )
{
- RECTL vRect;
- RECTL vRectHorz;
- RECTL vRectVert;
- RECTL vRectChild;
+ RECTL vRect;
+ ::WinQueryWindowRect(GetHwnd(), &vRect);
+ int height = vRect.yTop;
if (pRect)
{
vRect.xLeft = pRect->x;
- vRect.yTop = pRect->y + pRect->height;
+ vRect.yTop = height - pRect->y;
vRect.xRight = pRect->x + pRect->width;
- vRect.yBottom = pRect->y;
- }
- else
- {
- ::WinQueryWindowRect(GetHwnd(), &vRect);
+ vRect.yBottom = vRect.yTop - pRect->height;
}
nDy *= -1; // flip the sign of Dy as OS/2 is opposite Windows.
::WinScrollWindow( GetHwnd()
,(LONG)nDy
,&vRect
,&vRect
- ,NULLHANDLE
+ ,NULL
,NULL
,SW_SCROLLCHILDREN | SW_INVALIDATERGN
);
- Refresh();
} // end of wxWindowOS2::ScrollWindow
// ---------------------------------------------------------------------------
}
} // end of wxWindowOS2::SetWindowStyleFlag
-WXDWORD wxWindowOS2::OS2GetStyle(
- long lFlags
-, WXDWORD* pdwExstyle
-) const
+WXDWORD wxWindowOS2::OS2GetStyle( long lFlags,
+ WXDWORD* WXUNUSED(pdwExstyle) ) const
{
WXDWORD dwStyle = 0L;
dwStyle |= WS_CLIPSIBLINGS;
return dwStyle;
-} // end of wxWindowMSW::MSWGetStyle
+} // end of wxWindowOS2::OS2GetStyle
//
-// Make a Windows extended style from the given wxWindows window style
+// Make a Windows extended style from the given wxWidgets window style
//
WXDWORD wxWindowOS2::MakeExtendedStyle(
long lStyle
return dwStyle;
} // end of wxWindowOS2::MakeExtendedStyle
-//
-// Determines whether simulated 3D effects or CTL3D should be used,
-// applying a default border style if required, and returning an extended
-// style to pass to OS2Create.
-//
-WXDWORD wxWindowOS2::Determine3DEffects(
- WXDWORD dwDefaultBorderStyle
-, bool* pbWant3D
-) const
-{
- WXDWORD dwStyle = 0L;
-
- //
- // Native PM does not have any specialize 3D effects like WIN32 does,
- // so we have to try and invent them.
- //
-
- //
- // If matches certain criteria, then assume no 3D effects
- // unless specifically requested (dealt with in MakeExtendedStyle)
- //
- if (!GetParent() ||
- !IsKindOf(CLASSINFO(wxControl)) ||
- (m_windowStyle & wxNO_BORDER)
- )
- {
- *pbWant3D = FALSE;
- return MakeExtendedStyle(m_windowStyle, FALSE);
- }
-
- //
- // 1) App can specify global 3D effects
- //
- *pbWant3D = wxTheApp->GetAuto3D();
-
- //
- // 2) If the parent is being drawn with user colours, or simple border
- // specified, switch effects off.
- //
- if (GetParent() &&
- (GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) ||
- (m_windowStyle & wxSIMPLE_BORDER)
- )
- *pbWant3D = FALSE;
-
- //
- // 3) Control can override this global setting by defining
- // a border style, e.g. wxSUNKEN_BORDER
- //
- if ((m_windowStyle & wxDOUBLE_BORDER) ||
- (m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSTATIC_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER)
- )
- *pbWant3D = TRUE;
-
- dwStyle = MakeExtendedStyle( m_windowStyle
- ,FALSE
- );
-
- //
- // If we want 3D, but haven't specified a border here,
- // apply the default border style specified.
- //
- if (dwDefaultBorderStyle && (*pbWant3D) &&
- !((m_windowStyle & wxDOUBLE_BORDER) ||
- (m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSTATIC_BORDER) ||
- (m_windowStyle & wxSIMPLE_BORDER)
- )
- )
- dwStyle |= dwDefaultBorderStyle;
- return dwStyle;
-} // end of wxWindowOS2::Determine3DEffects
-
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::OnCommand(
- wxWindow& rWin
-, wxCommandEvent& rEvent
-)
-{
- if (GetEventHandler()->ProcessEvent(rEvent))
- return;
- if (m_parent)
- m_parent->GetEventHandler()->OnCommand( rWin
- ,rEvent
- );
-} // end of wxWindowOS2::OnCommand
-
-wxObject* wxWindowOS2::GetChild(
- int nNumber
-) const
-{
- //
- // Return a pointer to the Nth object in the Panel
- //
- wxNode* pNode = GetChildren().First();
- int n = nNumber;
-
- while (pNode && n--)
- pNode = pNode->Next();
- if (pNode)
- {
- wxObject* pObj = (wxObject*)pNode->Data();
- return(pObj);
- }
- else
- return NULL;
-} // end of wxWindowOS2::GetChild
-
-#endif // WXWIN_COMPATIBILITY
-
//
// Setup background and foreground colours correctly
//
//
// Generate a LEAVE event
//
- m_bMouseInWindow = FALSE;
+ m_bMouseInWindow = false;
//
// Unfortunately the mouse button and keyboard state may have changed
//
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);
(void)GetEventHandler()->ProcessEvent(rEvent);
}
}
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate(this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
} // end of wxWindowOS2::OnIdle
//
// Set this window to be the child of 'parent'.
//
-bool wxWindowOS2::Reparent(
- wxWindow* pParent
-)
+bool wxWindowOS2::Reparent( wxWindow* 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;
+ return true;
} // end of wxWindowOS2::Reparent
-void wxWindowOS2::Clear()
-{
- wxClientDC vDc((wxWindow*)this);
- wxBrush vBrush( GetBackgroundColour()
- ,wxSOLID
- );
-
- vDc.SetBackground(vBrush);
- vDc.Clear();
-} // end of wxWindowOS2::Clear
-
void wxWindowOS2::Update()
{
::WinUpdateWindow(GetHwnd());
Refresh();
} // end of wxWindowOS2::Thaw
-void wxWindowOS2::Refresh(
- bool bEraseBack
-, const wxRect* pRect
-)
+void wxWindowOS2::Refresh( bool bEraseBack,
+ const wxRect* pRect )
{
- HWND hWnd = GetHwnd();
+ HWND hWnd = GetHwnd();
if (hWnd)
{
if (pRect)
{
- RECTL vOs2Rect;
+ 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);
}
wxDropTarget* pDropTarget
)
{
- if (m_dropTarget != 0)
- {
- m_dropTarget->Revoke(m_hWnd);
- delete m_dropTarget;
- }
m_dropTarget = pDropTarget;
- if (m_dropTarget != 0)
- m_dropTarget->Register(m_hWnd);
} // end of wxWindowOS2::SetDropTarget
#endif
)
{
RECTL vRect;
- HWND hParent;
wxWindow* pParent = GetParent();
+ /* Due to OS/2's inverted coordinate system, changing the height
+ of a window requires repositioning all it's children, e.g. if
+ you want a child of height 100 to be at the top left corner of
+ the parent you need to position the lower left corner of the
+ child at (0, (height of parent - 100)), so, obviously, if the
+ height of the parent changes, the child needs to be repositioned. */
+ int nHeightDelta;
+ GetSize(0, &nHeightDelta);
+ nHeightDelta = nHeight - nHeightDelta;
+
if (pParent && !IsKindOf(CLASSINFO(wxDialog)))
{
int nOS2Height = GetOS2ParentHeight(pParent);
::WinQueryWindowRect(HWND_DESKTOP, &vRect);
nY = vRect.yTop - (nY + nHeight);
}
+
+ //
+ // In the case of a frame whose client is sized, the client cannot be
+ // large than its parent frame minus its borders! This usually happens
+ // when using an autosizer to size a frame to precisely hold client
+ // controls as in the notebook sample.
+ //
+ // In this case, we may need to resize both a frame and its client so we
+ // need a quick calc of the frame border size, then if the frame
+ // (less its borders) is smaller than the client, size the frame to
+ // encompass the client with the appropriate border size.
+ //
+ if (IsKindOf(CLASSINFO(wxFrame)))
+ {
+ RECTL vFRect;
+ HWND hWndFrame;
+ int nWidthFrameDelta = 0;
+ int nHeightFrameDelta = 0;
+ int nHeightFrame = 0;
+ int nWidthFrame = 0;
+ wxFrame* pFrame;
+
+ pFrame = wxDynamicCast(this, wxFrame);
+ hWndFrame = pFrame->GetFrame();
+ ::WinQueryWindowRect(hWndFrame, &vRect);
+ ::WinMapWindowPoints(hWndFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2);
+ vFRect = vRect;
+ ::WinCalcFrameRect(hWndFrame, &vRect, TRUE);
+ nWidthFrameDelta = ((vRect.xLeft - vFRect.xLeft) + (vFRect.xRight - vRect.xRight));
+ nHeightFrameDelta = ((vRect.yBottom - vFRect.yBottom) + (vFRect.yTop - vRect.yTop));
+ nWidthFrame = vFRect.xRight - vFRect.xLeft;
+ nHeightFrame = vFRect.yTop - vFRect.yBottom;
+
+ if (nWidth == vFRect.xRight - vFRect.xLeft &&
+ nHeight == vFRect.yTop - vFRect.yBottom)
+ {
+ //
+ // In this case the caller is not aware of OS/2's need to size both
+ // the frame and it's client and is really only moving the window,
+ // not resizeing it. So move the frame, and back off the sizes
+ // for a proper client fit.
+ //
+ ::WinSetWindowPos( hWndFrame
+ ,HWND_TOP
+ ,(LONG)nX - (vRect.xLeft - vFRect.xLeft)
+ ,(LONG)nY - (vRect.yBottom - vFRect.yBottom)
+ ,(LONG)0
+ ,(LONG)0
+ ,SWP_MOVE
+ );
+ nX += (vRect.xLeft - vFRect.xLeft);
+ nY += (vRect.yBottom - vFRect.yBottom);
+ nWidth -= nWidthFrameDelta;
+ nHeight -= nHeightFrameDelta;
+ }
+ else
+ {
+ if (nWidth > nWidthFrame - nHeightFrameDelta ||
+ nHeight > nHeightFrame - nHeightFrameDelta)
+ {
+ ::WinSetWindowPos( hWndFrame
+ ,HWND_TOP
+ ,(LONG)nX - (vRect.xLeft - vFRect.xLeft)
+ ,(LONG)nY - (vRect.yBottom - vFRect.yBottom)
+ ,(LONG)nWidth + nWidthFrameDelta
+ ,(LONG)nHeight + nHeightFrameDelta
+ ,SWP_MOVE | SWP_SIZE
+ );
+ }
+ }
+ }
+
::WinSetWindowPos( GetHwnd()
,HWND_TOP
,(LONG)nX
,(LONG)nY
,(LONG)nWidth
,(LONG)nHeight
- ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW
+ ,SWP_SIZE | SWP_MOVE
);
if (m_vWinSwp.cx == 0 && m_vWinSwp.cy == 0 && m_vWinSwp.fl == 0)
//
// which will cause the scrollbars to be displayed via the SetScrollbar
// call in CWindow.
//
- if ( IsKindOf(CLASSINFO(wxGenericScrolledWindow)) ||
- IsKindOf(CLASSINFO(wxScrolledWindow))
- )
+ if (IsKindOf(CLASSINFO(wxScrolledWindow)))
{
int nAdjustWidth = 0;
int nAdjustHeight = 0;
,vSwpScroll.cy - nAdjustHeight
,SWP_MOVE | SWP_SIZE
);
- nYDiff += nAdjustHeight;
+ nYDiff -= nAdjustHeight;
}
MoveChildren(nYDiff);
::WinQueryWindowPos(GetHwnd(), &m_vWinSwp);
}
+#if 0
+ // FIXME: By my logic, the next line should be needed as it moves child
+ // windows when resizing the parent (see comment at beginning of
+ // function). However, this seems to cause lots of problems. At
+ // least, e.g. the grid sample almost works with this line
+ // commented out but crashes badly with it.
+ MoveChildren(nHeightDelta);
+#endif
} // end of wxWindowOS2::DoMoveWindow
//
// the width/height to best suit our contents, otherwise we reuse the current
// width/height
//
-void wxWindowOS2::DoSetSize(
- int nX
-, int nY
-, int nWidth
-, int nHeight
-, int nSizeFlags
-)
+void wxWindowOS2::DoSetSize( int nX,
+ int nY,
+ int nWidth,
+ int nHeight,
+ int nSizeFlags )
{
//
// Get the current size and position...
//
- int nCurrentX;
- int nCurrentY;
- int nCurrentWidth;
- int nCurrentHeight;
- wxSize vSize(-1, -1);
+ int nCurrentX;
+ int nCurrentY;
+ int nCurrentWidth;
+ int nCurrentHeight;
+ wxSize vSize = wxDefaultSize;
GetPosition(&nCurrentX, &nCurrentY);
GetSize(&nCurrentWidth, &nCurrentHeight);
// Must convert Y coords to test for equality under OS/2
//
int nY2 = nY;
- wxWindow* pParent = (wxWindow*)GetParent();
-
- if (pParent && !IsKindOf(CLASSINFO(wxDialog)))
- {
- int nOS2Height = GetOS2ParentHeight(pParent);
-
- nY2 = nOS2Height - (nY2 + nHeight);
- }
- else
- {
- RECTL vRect;
- ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
- nY2 = vRect.yTop - (nY2 + nHeight);
- }
if (nX == nCurrentX && nY2 == 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);
- if (nWidth == -1)
+ if (nWidth == wxDefaultCoord)
{
if (nSizeFlags & wxSIZE_AUTO_WIDTH)
{
}
}
- if (nHeight == -1)
+ if (nHeight == wxDefaultCoord)
{
if (nSizeFlags & wxSIZE_AUTO_HEIGHT)
{
- if (vSize.x == -1)
+ if (vSize.x == wxDefaultCoord)
{
vSize = DoGetBestSize();
}
}
}
- DoMoveWindow( nX
- ,nY
- ,nWidth
- ,nHeight
- );
+ DoMoveWindow( nX, nY, nWidth, nHeight );
} // end of wxWindowOS2::DoSetSize
-void wxWindowOS2::DoSetClientSize(
- int nWidth
-, int nHeight
-)
+void wxWindowOS2::DoSetClientSize( int nWidth,
+ int nHeight )
{
- wxWindow* pParent = GetParent();
- HWND hWnd = GetHwnd();
- HWND hParentWnd = (HWND)0;
- POINTL vPoint;
- RECTL vRect;
- RECTL vRect2;
- RECTL vRect3;
- HWND hClientWnd = (HWND)0;
-
- hClientWnd = ::WinWindowFromID(hWnd, FID_CLIENT);
- ::WinQueryWindowRect(hClientWnd, &vRect2);
- ::WinQueryWindowRect(hWnd, &vRect);
- ::WinQueryWindowRect(hParentWnd, &vRect3);
+ POINTL vPoint;
+ int nActualWidth;
+ int nActualHeight;
+ wxWindow* pParent = (wxWindow*)GetParent();
+ HWND hParentWnd = (HWND)0;
- int nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
- int nActualHeight = vRect2.yTop - vRect2.yBottom - vRect.yTop + nHeight;
-
- vPoint.x = vRect2.xLeft;
- vPoint.y = vRect2.yBottom;
if (pParent)
+ hParentWnd = (HWND)pParent->GetHWND();
+
+ if (IsKindOf(CLASSINFO(wxFrame)))
{
- vPoint.x -= vRect3.xLeft;
- vPoint.y -= vRect3.yBottom;
+ wxFrame* pFrame = wxDynamicCast(this, wxFrame);
+ HWND hFrame = pFrame->GetFrame();
+ RECTL vRect;
+ RECTL vRect2;
+ RECTL vRect3;
+
+ ::WinQueryWindowRect(GetHwnd(), &vRect2);
+ ::WinQueryWindowRect(hFrame, &vRect);
+ ::WinQueryWindowRect(hParentWnd, &vRect3);
+ nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
+ nActualHeight = vRect2.yTop - vRect2.yBottom - vRect.yTop + nHeight;
+
+ vPoint.x = vRect2.xLeft;
+ vPoint.y = vRect2.yBottom;
+ if (pParent)
+ {
+ vPoint.x -= vRect3.xLeft;
+ vPoint.y -= vRect3.yBottom;
+ }
}
+ else
+ {
+ int nX;
+ int nY;
- DoMoveWindow(vPoint.x, vPoint.y, nActualWidth, nActualHeight);
+ GetPosition(&nX, &nY);
+ nActualWidth = nWidth;
+ nActualHeight = nHeight;
- wxSizeEvent vEvent(wxSize(nWidth, nHeight), m_windowId);
+ vPoint.x = nX;
+ vPoint.y = nY;
+ }
+ DoMoveWindow( vPoint.x, vPoint.y, nActualWidth, nActualHeight );
+
+ wxSize size( nWidth, nHeight );
+ wxSizeEvent vEvent( size, m_windowId );
vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::DoSetClientSize
-wxPoint wxWindowOS2::GetClientAreaOrigin() const
-{
- return wxPoint(0, 0);
-} // end of wxWindowOS2::GetClientAreaOrigin
-
// ---------------------------------------------------------------------------
// text metrics
// ---------------------------------------------------------------------------
return(vFontMetrics.lAveCharWidth);
} // end of wxWindowOS2::GetCharWidth
-void wxWindowOS2::GetTextExtent(
- const wxString& rString
-, int* pX
-, int* pY
-, int* pDescent
-, int* pExternalLeading
-, const wxFont* pTheFont
-) const
-{
- POINTL avPoint[TXTBOX_COUNT];
- POINTL vPtMin;
- POINTL vPtMax;
- int i;
- int l;
- FONTMETRICS vFM; // metrics structure
- BOOL bRc;
- char* pStr;
- ERRORID vErrorCode; // last error id code
- HPS hPS;
-
+void wxWindowOS2::GetTextExtent( const wxString& rString,
+ int* pX,
+ int* pY,
+ int* pDescent,
+ int* pExternalLeading,
+ const wxFont* WXUNUSED(pTheFont) ) const
+{
+ POINTL avPoint[TXTBOX_COUNT];
+ POINTL vPtMin;
+ POINTL vPtMax;
+ int i;
+ int l;
+ FONTMETRICS vFM; // metrics structure
+ BOOL bRc = FALSE;
+ char* pStr;
+ HPS hPS;
hPS = ::WinGetPS(GetHwnd());
- l = rString.Length();
+ l = rString.length();
if (l > 0L)
{
pStr = (PCH)rString.c_str();
//
// In world coordinates.
//
- bRc = ::GpiQueryTextBox( hPS
- ,l
- ,pStr
- ,TXTBOX_COUNT // return maximum information
- ,avPoint // array of coordinates points
- );
+ bRc = ::GpiQueryTextBox( hPS,
+ l,
+ pStr,
+ TXTBOX_COUNT,// return maximum information
+ avPoint // array of coordinates points
+ );
if (bRc)
{
vPtMin.x = avPoint[0].x;
{
//
// Get the mouse position
- POINTL vPt;
+ POINTL vPt;
::WinQueryPointerPos(HWND_DESKTOP, &vPt);
// 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);
+ HWND hWnd = ::WinWindowFromPoint(HWND_DESKTOP, &vPt, TRUE);
while (hWnd && (hWnd != GetHwnd()))
hWnd = ::WinQueryWindow(hWnd, QW_PARENT);
return hWnd != NULL;
} // end of wxWindowOS2::IsMouseInWindow
-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
-
-void wxWindowOS2::CreateCaret(
- int nWidth
-, int nHeight
-)
-{
- SetCaret(new wxCaret( this
- ,nWidth
- ,nHeight
- ));
-} // end of wxWindowOS2::CreateCaret
-
-void wxWindowOS2::CreateCaret(
- const wxBitmap* pBitmap
-)
-{
- wxFAIL_MSG("not implemented");
-} // end of wxWindowOS2::CreateCaret
-
-void wxWindowOS2::ShowCaret(
- bool bShow
-)
-{
- wxCHECK_RET( m_caret, "no caret to show" );
-
- m_caret->Show(bShow);
-} // end of wxWindowOS2::ShowCaret
-
-void wxWindowOS2::DestroyCaret()
-{
- SetCaret(NULL);
-} // end of wxWindowOS2::DestroyCaret
-
-void wxWindowOS2::SetCaretPos(
- int nX
-, int nY)
-{
- wxCHECK_RET( m_caret, "no caret to move" );
-
- m_caret->Move( nX
- ,nY
- );
-} // end of wxWindowOS2::SetCaretPos
-
-void wxWindowOS2::GetCaretPos(
- int* pX
-, int* pY
-) const
-{
- wxCHECK_RET( m_caret, "no caret to get position of" );
-
- m_caret->GetPosition( pX
- ,pY
- );
-} // end of wxWindowOS2::GetCaretPos
-
-#endif //wxUSE_CARET
// ---------------------------------------------------------------------------
// popup menu
// ---------------------------------------------------------------------------
//
#if wxUSE_MENUS_NATIVE
-static void wxYieldForCommandsOnly()
+bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
{
- //
- // Peek all WM_COMMANDs (it will always return WM_QUIT too but we don't
- // want to process it here)
- //
- QMSG vMsg;
-
- while (::WinPeekMsg(vHabmain, &vMsg, (HWND)0, WM_COMMAND, WM_COMMAND, PM_REMOVE)
- && vMsg.msg != WM_QUIT)
- {
- wxTheApp->DoMessage((WXMSG*)&vMsg);
- }
-}
-#endif // wxUSE_MENUS_NATIVE
+ HWND hWndOwner = GetHwnd();
+ HWND hWndParent = GetHwnd();
+ HWND hMenu = GetHmenuOf(pMenu);
+ bool bIsWaiting = true;
+ int nHeight;
-#if wxUSE_MENUS_NATIVE
-bool wxWindowOS2::DoPopupMenu(
- wxMenu* pMenu
-, int nX
-, int nY
-)
-{
- HWND hWndOwner = GetHwnd();
- HWND hWndParent = GetHwnd();
- HWND hMenu = GetHmenuOf(pMenu);
- bool bIsWaiting = TRUE;
+ // Protect against recursion
+ if (wxCurrentPopupMenu)
+ return false;
pMenu->SetInvokingWindow(this);
pMenu->UpdateUI();
- DoClientToScreen( &nX
- ,&nY
- );
+ if ( nX == -1 && nY == -1 )
+ {
+ wxPoint mouse = wxGetMousePosition();
+ nX = mouse.x; nY = mouse.y;
+ }
+ else
+ {
+ DoClientToScreen( &nX
+ ,&nY
+ );
+ DoGetSize(0,&nHeight);
+ nY = nHeight - nY;
+ }
wxCurrentPopupMenu = pMenu;
::WinPopupMenu( hWndParent
while(bIsWaiting)
{
QMSG vMsg;
- BOOL bRc = ::WinGetMsg(vHabmain, &vMsg, HWND(NULL), 0, 0);
- if (vMsg.msg == WM_MENUEND || vMsg.msg == WM_COMMAND)
- {
- bIsWaiting = FALSE;
- }
+ ::WinGetMsg(vHabmain,&vMsg, (HWND)0, 0, 0);
+ if (vMsg.msg == WM_COMMAND)
+ bIsWaiting = false;
::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
-
}
+
wxCurrentPopupMenu = NULL;
pMenu->SetInvokingWindow(NULL);
- return TRUE;
+ return true;
} // end of wxWindowOS2::DoPopupMenu
#endif // wxUSE_MENUS_NATIVE
// pre/post message processing
// ===========================================================================
-MRESULT wxWindowOS2::OS2DefWindowProc(
- WXUINT uMsg
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
+MRESULT wxWindowOS2::OS2DefWindowProc( WXUINT uMsg,
+ WXWPARAM wParam,
+ WXLPARAM lParam )
{
if (m_fnOldWndProc)
return (MRESULT)m_fnOldWndProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam);
return ::WinDefWindowProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam);
} // end of wxWindowOS2::OS2DefWindowProc
-bool wxWindowOS2::OS2ProcessMessage(
- WXMSG* pMsg
-)
+bool wxWindowOS2::OS2ProcessMessage( WXMSG* pMsg )
{
// wxUniversal implements tab traversal itself
#ifndef __WXUNIVERSAL__
//
// 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)
{
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))
{
//
if (!bShiftDown)
{
- bProcess = FALSE;
+ bProcess = false;
}
else
{
{
case DLGC_ENTRYFIELD:
case DLGC_MLE:
- bProcess = TRUE;
+ bProcess = true;
break;
default:
- bProcess = FALSE;
+ bProcess = false;
}
//
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:
//
// ctrl-enter is not processed
//
- return FALSE;
+ return false;
}
else if (ulDlgCode & DLGC_BUTTON)
{
//
// buttons want process Enter themselevs
//
- bProcess = FALSE;
+ bProcess = false;
}
else
{
// 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.
break;
default:
- bProcess = FALSE;
+ bProcess = false;
}
if (bProcess)
//
pBtn->SetDefault();
}
- return TRUE;
+ return true;
}
}
}
// Let Dialogs process
//
if (::WinSendMsg(pQMsg->hwnd, WM_QUERYDLGCODE, pQMsg, 0));
- return TRUE;
+ return true;
}
#else
pMsg = pMsg; // just shut up the compiler
#endif // __WXUNIVERSAL__
-#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);
- }
-#endif // wxUSE_TOOLTIPS
-
- return FALSE;
+ return false;
} // end of wxWindowOS2::OS2ProcessMessage
-bool wxWindowOS2::OS2TranslateMessage(
- WXMSG* pMsg
-)
+bool wxWindowOS2::OS2TranslateMessage( WXMSG* pMsg )
{
#if wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
- return m_acceleratorTable.Translate(m_hWnd, pMsg);
+ return m_acceleratorTable.Translate(m_hWnd, pMsg);
#else
- pMsg = pMsg;
- return FALSE;
+ pMsg = pMsg;
+ return false;
#endif //wxUSE_ACCEL
} // end of wxWindowOS2::OS2TranslateMessage
-bool wxWindowOS2::OS2ShouldPreProcessMessage(
- WXMSG* pMsg
-)
+bool wxWindowOS2::OS2ShouldPreProcessMessage( WXMSG* WXUNUSED(pMsg) )
{
// preprocess all messages by default
- return TRUE;
+ return true;
} // end of wxWindowOS2::OS2ShouldPreProcessMessage
// ---------------------------------------------------------------------------
} // end of wxWindowOS2::UnpackMenuSelect
// ---------------------------------------------------------------------------
-// Main wxWindows window proc and the window proc for wxWindow
+// Main wxWidgets window proc and the window proc for wxWindow
// ---------------------------------------------------------------------------
//
, MPARAM lParam
)
{
- //
- // Trace all ulMsgs - useful for the debugging
- //
-#ifdef __WXDEBUG__
- wxLogTrace(wxTraceMessages, wxT("Processing %s(wParam=%8lx, lParam=%8lx)"),
- wxGetMessageName(ulMsg), wParam, lParam);
-#endif // __WXDEBUG__
-
wxWindowOS2* pWnd = wxFindWinFromHandle((WXHWND)hWnd);
//
// We will add (or delete) messages we need to handle at this default
// level as we go
//
-MRESULT wxWindowOS2::OS2WindowProc(
- WXUINT uMsg
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
+MRESULT wxWindowOS2::OS2WindowProc( WXUINT uMsg,
+ WXWPARAM wParam,
+ WXLPARAM lParam )
{
//
// Did we process the uMsg?
//
- bool bProcessed = FALSE;
- MRESULT mResult;
+ bool bProcessed = false;
+ MRESULT mResult;
//
// For most messages we should return 0 when we do process the message
case WM_DESTROY:
HandleDestroy();
- bProcessed = TRUE;
+ bProcessed = true;
break;
case WM_MOVE:
{
if (pFrame->GetStatusBar())
pFrame->PositionStatusBar();
+ if (pFrame->GetToolBar())
+ pFrame->PositionToolBar();
}
}
}
bProcessed = HandleActivate( wState
,(WXHWND)hWnd
);
- bProcessed = FALSE;
+ bProcessed = false;
}
break;
// Don't let the DefWindowProc() destroy our window - we'll do it
// ourselves in ~wxWindow
//
- bProcessed = TRUE;
+ bProcessed = true;
mResult = (MRESULT)TRUE;
break;
bProcessed = HandleMouseEvent( uMsg
,nX
,nY
- ,(WXUINT)SHORT1FROMMP(wParam)
+ ,(WXUINT)SHORT2FROMMP(lParam)
);
}
else
,&nX
,&nY
);
+ if (!pWin->IsOfStandardClass())
+ {
+ if (uMsg == WM_BUTTON1DOWN && pWin->AcceptsFocus() )
+ pWin->SetFocus();
+ }
bProcessed = pWin->HandleMouseEvent( uMsg
,nX
,nY
- ,(WXUINT)SHORT1FROMMP(wParam)
+ ,(WXUINT)SHORT2FROMMP(lParam)
);
}
}
}
else
{
- bProcessed = OS2OnMeasureItem(nIdCtrl,
- (WXMEASUREITEMSTRUCT *)lParam);
+ return MRFROMLONG(OS2OnMeasureItem( nIdCtrl
+ ,(WXMEASUREITEMSTRUCT *)lParam
+ ));
}
if ( bProcessed )
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()
}
else // keydown event
{
- m_bLastKeydownProcessed = FALSE;
+ m_bLastKeydownProcessed = false;
//
// If this has been processed by an event handler,
// return 0 now (we've handled it). DON't RETURN
case VK_CAPSLOCK:
case VK_NUMLOCK:
case VK_SCRLLOCK:
- bProcessed = TRUE;
+ 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;
default:
// a key in an EVT_KEY_DOWN handler is meant, by
// design, to prevent EVT_CHARs from happening
//
- m_bLastKeydownProcessed = FALSE;
- bProcessed = TRUE;
+ m_bLastKeydownProcessed = false;
+ bProcessed = true;
}
else // do generate a CHAR event
{
- bProcessed = HandleChar(wParam, lParam, TRUE);
+ bProcessed = HandleChar(wParam, lParam, true);
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);
+ wxNotebookEvent vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
+ ,(int)SHORT1FROMMP(wParam)
+ ,(int)pPage->ulPageIdNew
+ ,(int)pPage->ulPageIdCur
+ );
+ if (!pWin)
+ {
+ bProcessed = false;
+ break;
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxNotebook)))
+ {
+ wxNotebook* pNotebook = wxDynamicCast(pWin, wxNotebook);
+
+ vEvent.SetEventObject(pWin);
+ pNotebook->OnSelChange(vEvent);
+ bProcessed = true;
+ }
+ else
+ bProcessed = false;
+ }
+ else
+ bProcessed = false;
+ }
+ break;
+
+ case BN_CLICKED: // Dups as LN_SELECT and CBN_LBSELECT
+ {
+ HWND hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam));
+ wxWindowOS2* pWin = wxFindWinFromHandle(hWnd);
+
+ if (!pWin)
+ {
+ bProcessed = false;
+ break;
+ }
+ //
+ // Simulate a WM_COMMAND here, as wxWidgets expects all control
+ // button clicks to generate WM_COMMAND msgs, not WM_CONTROL
+ //
+ if (pWin->IsKindOf(CLASSINFO(wxRadioBox)))
+ {
+ wxRadioBox* pRadioBox = wxDynamicCast(pWin, wxRadioBox);
+
+ pRadioBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(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)
+ );
+ }
+ return 0;
+ }
+ // break;
+
+ case LN_ENTER: /* dups as CBN_EFCHANGE */
+ {
+ HWND hWnd = HWNDFROMMP(lParam);
+ wxWindowOS2* pWin = wxFindWinFromHandle(hWnd);
+
+ if (!pWin)
+ {
+ bProcessed = false;
+ break;
+ }
+ //
+ // Simulate a WM_COMMAND here, as wxWidgets expects all control
+ // button clicks to generate WM_COMMAND msgs, not WM_CONTROL
+ //
+ if (pWin->IsKindOf(CLASSINFO(wxListBox)))
+ {
+ wxListBox* pListBox = wxDynamicCast(pWin, wxListBox);
+
+ pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(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;
+ char zVal[10];
+ long lVal;
::WinSendMsg( HWNDFROMMP(lParam)
,SPBM_QUERYVALUE
- ,&zVal
+ ,&zVal[0]
,MPFROM2SHORT( (USHORT)10
,(USHORT)SPBQ_UPDATEIFVALID
)
);
lVal = atol(zVal);
bProcessed = OS2OnScroll( wxVERTICAL
- ,(int)SHORT2FROMMP(wParam)
- ,(int)lVal
+ ,(WXWORD)SHORT2FROMMP(wParam)
+ ,(WXWORD)lVal
,HWNDFROMMP(lParam)
);
}
case SLN_SLIDERTRACK:
{
- HWND hWnd = ::WinWindowFromID(GetHWND(), SHORT1FROMMP(wParam));
- wxWindowOS2* pChild = wxFindWinFromHandle(hWnd);
+ HWND hWnd = ::WinWindowFromID(GetHWND(), SHORT1FROMMP(wParam));
+ wxWindowOS2* pChild = wxFindWinFromHandle(hWnd);
+ if (!pChild)
+ {
+ bProcessed = false;
+ break;
+ }
if (pChild->IsKindOf(CLASSINFO(wxSlider)))
bProcessed = OS2OnScroll( wxVERTICAL
- ,(int)SHORT2FROMMP(wParam)
- ,(int)LONGFROMMP(lParam)
+ ,(WXWORD)SHORT2FROMMP(wParam)
+ ,(WXWORD)LONGFROMMP(lParam)
,hWnd
);
}
if ( bProcessed )
{
// we never set focus from here
- mResult = FALSE;
+ mResult = (MRESULT)FALSE;
}
break;
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)
{
return mResult;
} // end of wxWindowOS2::OS2WindowProc
-#ifndef __EMX__
-// clashes with wxDlgProc in toplevel.cpp?
-//
-// Dialog window proc
-//
-MRESULT wxDlgProc(
- HWND WXUNUSED(hWnd)
-, UINT uMsg
-, MPARAM WXUNUSED(wParam)
-, MPARAM WXUNUSED(lParam))
-{
- if (uMsg == WM_INITDLG)
- {
- //
- // For this message, returning TRUE tells system to set focus to the
- // first control in the dialog box
- //
- return (MRESULT)TRUE;
- }
- else
- {
- //
- // For all the other ones, FALSE means that we didn't process the
- // message
- //
- return (MRESULT)0;
- }
-} // end of wxDlgProc
-#endif
+// ----------------------------------------------------------------------------
+// wxWindow <-> HWND map
+// ----------------------------------------------------------------------------
+
+wxWinHashTable *wxWinHandleHash = NULL;
wxWindow* wxFindWinFromHandle(
WXHWND hWnd
)
{
- wxNode* pNode = wxWinHandleList->Find((long)hWnd);
-
- if (!pNode)
- return NULL;
- return (wxWindow *)pNode->Data();
+ return (wxWindow *)wxWinHandleHash->Get((long)hWnd);
} // end of wxFindWinFromHandle
void wxAssociateWinWithHandle(
if (pOldWin && (pOldWin != pWin))
{
wxString str(pWin->GetClassInfo()->GetClassName());
- wxLogError( "Bug! Found existing HWND %X for new window of class %s"
+
+ wxLogError( _T("Bug! Found existing HWND %X for new window of class %s")
,(int)hWnd
- ,(const char*)str
+ ,str.c_str()
);
}
else if (!pOldWin)
{
- wxWinHandleList->Append( (long)hWnd
- ,pWin
- );
+ wxWinHandleHash->Put( (long)hWnd
+ ,(wxWindow *)pWin
+ );
}
} // end of wxAssociateWinWithHandle
-void wxRemoveHandleAssociation(
- wxWindowOS2* pWin
-)
+void wxRemoveHandleAssociation( wxWindowOS2* pWin )
{
- wxWinHandleList->DeleteObject(pWin);
+ wxWinHandleHash->Delete((long)pWin->GetHWND());
} // end of wxRemoveHandleAssociation
//
{
}
-bool wxWindowOS2::OS2GetCreateWindowCoords(
- const wxPoint& rPos
-, const wxSize& rSize
-, int& rnX
-, int& rnY
-, int& rnWidth
-, int& rnHeight
-) const
+bool wxWindowOS2::OS2GetCreateWindowCoords( const wxPoint& rPos,
+ const wxSize& rSize,
+ int& rnX,
+ int& rnY,
+ int& rnWidth,
+ int& rnHeight ) const
{
- bool bNonDefault = FALSE;
+ bool bNonDefault = false;
+ static const int DEFAULT_Y = 200;
+ static const int DEFAULT_H = 250;
- if (rPos.x == -1)
+ if (rPos.x == wxDefaultCoord)
{
- //
- // If set x to CW_USEDEFAULT, y parameter is ignored anyhow so we can
- // just as well set it to CW_USEDEFAULT as well
rnX = rnY = CW_USEDEFAULT;
}
else
{
rnX = rPos.x;
- rnY = rPos.y == -1 ? CW_USEDEFAULT : rPos.y;
- bNonDefault = TRUE;
+ rnY = rPos.y == wxDefaultCoord ? DEFAULT_Y : rPos.y;
+ bNonDefault = true;
}
- if (rSize.x == -1)
+ if (rSize.x == wxDefaultCoord)
{
- //
- // As abobe, h is not used at all in this case anyhow
- //
rnWidth = rnHeight = CW_USEDEFAULT;
}
else
{
rnWidth = rSize.x;
- rnHeight = rSize.y == -1 ? CW_USEDEFAULT : rSize.y;
- bNonDefault = TRUE;
+ rnHeight = rSize.y == wxDefaultCoord ? DEFAULT_H : rSize.y;
+ bNonDefault = true;
}
return bNonDefault;
} // end of wxWindowOS2::OS2GetCreateWindowCoords
-bool wxWindowOS2::OS2Create(
- PSZ zClass
-, const char* zTitle
-, WXDWORD dwStyle
-, const wxPoint& rPos
-, const wxSize& rSize
-, void* pCtlData
-, WXDWORD dwExStyle
-, bool bIsChild
-)
+WXHWND wxWindowOS2::OS2GetParent() const
{
- ERRORID vError;
- wxString sError;
- int nX = 0L;
- int nY = 0L;
- int nWidth = 0L;
- int nHeight = 0L;
- wxWindow* pParent = GetParent();
- HWND hWnd = NULLHANDLE;
- HWND hParent;
- long lControlId = 0L;
- wxWindowCreationHook vHook(this);
- wxString sClassName((wxChar*)zClass);
+ return m_parent ? m_parent->GetHWND() : NULL;
+}
+
+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);
OS2GetCreateWindowCoords( rPos
,rSize
,nHeight
);
- if (GetWindowStyleFlag() & wxPOPUP_WINDOW)
- hParent = HWND_DESKTOP;
- else
- {
- if ((bIsChild || HasFlag(wxFRAME_TOOL_WINDOW)) && pParent )
- {
- //
- // This is either a normal child window or a top level window with
- // wxFRAME_TOOL_WINDOW style (see below)
- //
- hParent = GetHwndOf(pParent);
- }
- else
- {
- //
- // This is either a window for which no parent was specified (not
- // much we can do then) or a frame without wxFRAME_TOOL_WINDOW
- // style: we should use NULL parent HWND for it or it would be
- // always on top of its parent which is not what we usually want
- // (in fact, we only want it for frames with the special
- // wxFRAME_TOOL_WINDOW as above)
- //
- hParent = NULL;
- }
- }
if (bIsChild)
{
lControlId = GetId();
// which is the same but without CS_[HV]REDRAW class styles so using it
// ensures that the window is not fully repainted on each resize
//
- if (GetWindowStyleFlag() & wxNO_FULL_REPAINT_ON_RESIZE)
+ if (!HasFlag(wxFULL_REPAINT_ON_RESIZE))
{
sClassName += wxT("NR");
}
- m_hWnd = (WXHWND)::WinCreateWindow( (HWND)hParent
- ,(PSZ)sClassName.c_str()
- ,(PSZ)zTitle ? zTitle : ""
- ,(ULONG)dwStyle
- ,(LONG)0L
- ,(LONG)0L
- ,(LONG)0L
- ,(LONG)0L
- ,NULLHANDLE
- ,HWND_TOP
- ,(ULONG)lControlId
- ,pCtlData
- ,NULL
- );
+ m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent()
+ ,(PSZ)sClassName.c_str()
+ ,(PSZ)(zTitle ? zTitle : wxEmptyString)
+ ,(ULONG)dwStyle
+ ,(LONG)0L
+ ,(LONG)0L
+ ,(LONG)0L
+ ,(LONG)0L
+ ,NULLHANDLE
+ ,HWND_TOP
+ ,(ULONG)lControlId
+ ,pCtlData
+ ,NULL
+ );
if (!m_hWnd)
{
vError = ::WinGetLastError(wxGetInstance());
sError = wxPMErrorToStr(vError);
- return FALSE;
+ return false;
}
SubclassWin(m_hWnd);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- m_backgroundColour.Set(wxString("GREY"));
+ m_backgroundColour.Set(wxString(wxT("GREY")));
- LONG lColor = (LONG)m_backgroundColour.GetPixel();
+ LONG lColor = (LONG)m_backgroundColour.GetPixel();
if (!::WinSetPresParam( m_hWnd
,PP_BACKGROUNDCOLOR
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error creating frame. Error: %s\n", sError);
- return FALSE;
+ wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
+ return false;
}
SetSize( nX
,nY
,nWidth
,nHeight
);
- return TRUE;
+ return true;
} // end of WinGuiBase_Window::OS2Create
// ===========================================================================
// window creation/destruction
// ---------------------------------------------------------------------------
-bool wxWindowOS2::HandleCreate(
- WXLPCREATESTRUCT WXUNUSED(vCs)
-, bool* pbMayCreate
-)
+bool wxWindowOS2::HandleCreate( WXLPCREATESTRUCT WXUNUSED(vCs),
+ bool* pbMayCreate )
{
wxWindowCreateEvent vEvent((wxWindow*)this);
(void)GetEventHandler()->ProcessEvent(vEvent);
- *pbMayCreate = TRUE;
- return TRUE;
+ *pbMayCreate = true;
+ return true;
} // end of wxWindowOS2::HandleCreate
bool wxWindowOS2::HandleDestroy()
{
wxWindowDestroyEvent vEvent((wxWindow*)this);
-
+ vEvent.SetId(GetId());
(void)GetEventHandler()->ProcessEvent(vEvent);
//
#if wxUSE_DRAG_AND_DROP
if (m_dropTarget != NULL)
{
- m_dropTarget->Revoke(m_hWnd);
delete m_dropTarget;
m_dropTarget = NULL;
}
//
// WM_DESTROY handled
//
- return TRUE;
+ return true;
} // end of wxWindowOS2::HandleDestroy
// ---------------------------------------------------------------------------
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleActivate
-bool wxWindowOS2::HandleSetFocus(
- WXHWND WXUNUSED(hWnd)
-)
+bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
{
//
// Notify the parent keeping track of focus for the kbd navigation
// after the control gets to process it from EN_FOCUS handler
if ( wxDynamicCastThis(wxTextCtrl) )
{
- return FALSE;
+ return false;
}
#endif // wxUSE_TEXTCTRL
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleSetFocus
-bool wxWindowOS2::HandleKillFocus(
- WXHWND WXUNUSED(hWnd)
-)
+bool wxWindowOS2::HandleKillFocus( WXHWND hWnd )
{
#if wxUSE_CARET
//
}
#endif // wxUSE_CARET
+#if wxUSE_TEXTCTRL
+ //
+ // If it's a wxTextCtrl don't send the event as it will be done
+ // after the control gets to process it.
+ //
+ wxTextCtrl* pCtrl = wxDynamicCastThis(wxTextCtrl);
+
+ if (pCtrl)
+ {
+ return false;
+ }
+#endif
+
+ //
+ // Don't send the event when in the process of being deleted. This can
+ // only cause problems if the event handler tries to access the object.
+ //
+ if ( m_isBeingDeleted )
+ {
+ return false;
+ }
+
wxFocusEvent vEvent( wxEVT_KILL_FOCUS
,m_windowId
);
vEvent.SetEventObject(this);
+
+ //
+ // wxFindWinFromHandle() may return NULL, it is ok
+ //
+ vEvent.SetWindow(wxFindWinFromHandle(hWnd));
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleKillFocus
{
wxShowEvent vEvent(GetId(), bShow);
- vEvent.m_eventObject = this;
+ vEvent.SetEventObject(this);
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleShow
-bool wxWindowOS2::HandleInitDialog(
- WXHWND WXUNUSED(hWndFocus)
-)
+bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) )
{
wxInitDialogEvent vEvent(GetId());
- vEvent.m_eventObject = this;
+ vEvent.SetEventObject(this);
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleInitDialog
bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam))
{
// TODO: We'll handle drag and drop later
- return FALSE;
+ return false;
}
-bool wxWindowOS2::HandleSetCursor(
- USHORT WXUNUSED(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;
+ return true;
} // end of wxWindowOS2::HandleSetCursor
// ---------------------------------------------------------------------------
// owner drawn stuff
// ---------------------------------------------------------------------------
-bool wxWindowOS2::OS2OnDrawItem(
- int vId
-, WXDRAWITEMSTRUCT* pItemStruct
-)
+bool wxWindowOS2::OS2OnDrawItem( int vId,
+ WXDRAWITEMSTRUCT* pItemStruct )
{
#if wxUSE_OWNER_DRAWN
wxDC vDc;
,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
);
- vDc.SetHDC( hDC
- ,FALSE
- );
- vDc.SetHPS(pMeasureStruct->hps);
+ vDc.SetHDC( hDC, false );
+ vDc.SetHPS( pMeasureStruct->hps );
//
- // Load the wxWindows Pallete and set to RGB mode
+ // Load the wxWidgets Pallete and set to RGB mode
//
if (!::GpiCreateLogColorTable( pMeasureStruct->hps
,0L
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Unable to set current color table. Error: %s\n", sError);
+ wxLogError(_T("Unable to set current color table. Error: %s\n"), sError.c_str());
}
//
// Set the color table to RGB mode
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Unable to set current color table. Error: %s\n", sError);
+ wxLogError(_T("Unable to set current color table. Error: %s\n"), sError.c_str());
}
wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
-
- int eAction = 0;
- int eStatus = 0;
+ int eAction = 0;
+ int eStatus = 0;
if (pMeasureStruct->fsAttribute == pMeasureStruct->fsAttributeOld)
{
// For now we don't care about anything else
// just ignore the entire message!
//
- return TRUE;
+ return true;
}
}
//
vId = vId;
pItemStruct = pItemStruct;
#endif
- return FALSE;
+ return false;
} // end of wxWindowOS2::OS2OnDrawItem
-bool wxWindowOS2::OS2OnMeasureItem(
- int lId
-, WXMEASUREITEMSTRUCT* pItemStruct
-)
+long wxWindowOS2::OS2OnMeasureItem( int lId,
+ WXMEASUREITEMSTRUCT* pItemStruct )
{
#if wxUSE_OWNER_DRAWN
//
,&nHeight
))
{
+ MRESULT mRc;
+
pMeasureStruct->rclItem.xRight = nWidth;
pMeasureStruct->rclItem.xLeft = 0L;
pMeasureStruct->rclItem.yTop = nHeight;
pMeasureStruct->rclItem.yBottom = 0L;
- return TRUE;
+ mRc = MRFROM2SHORT(nHeight, nWidth);
+ return LONGFROMMR(mRc);
}
- return FALSE;
+ return 0L;
}
}
wxWindow* pItem = FindItem(lId);
if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
{
- return ((wxControl *)pItem)->OS2OnMeasure(pItemStruct);
+ OWNERITEM vItem;
+
+ vItem.idItem = (LONG)pItemStruct;
+ return ((wxControl *)pItem)->OS2OnMeasure((WXMEASUREITEMSTRUCT*)&vItem);
}
#else
lId = lId;
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleSysColorChange
-bool wxWindowOS2::HandleCtlColor(
- WXHBRUSH* WXUNUSED(phBrush)
-)
+bool wxWindowOS2::HandleCtlColor( WXHBRUSH* WXUNUSED(phBrush) )
{
//
// Not much provided with message. So not sure I can do anything with it
//
- return TRUE;
+ return true;
} // end of wxWindowOS2::HandleCtlColor
wxSysColourChangedEvent& rEvent
)
{
- wxNode* pNode = GetChildren().First();
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- while (pNode)
+ while (node)
{
//
// Only propagate to non-top-level windows
//
- wxWindow* pWin = (wxWindow *)pNode->Data();
+ wxWindow* pWin = (wxWindow *)node->GetData();
if (pWin->GetParent())
{
wxSysColourChangedEvent vEvent;
- rEvent.m_eventObject = pWin;
+ rEvent.SetEventObject(pWin);
pWin->GetEventHandler()->ProcessEvent(vEvent);
}
- pNode = pNode->Next();
+ node = node->GetNext();
}
} // end of wxWindowOS2::OnSysColourChanged
// painting
// ---------------------------------------------------------------------------
+void wxWindow::OnPaint (
+ wxPaintEvent& rEvent
+)
+{
+ HDC hDC = (HDC)wxPaintDC::FindDCInCache((wxWindow*) rEvent.GetEventObject());
+
+ if (hDC != 0)
+ {
+ OS2DefWindowProc( (WXUINT)WM_PAINT
+ ,(WXWPARAM)hDC
+ ,(WXLPARAM)0
+ );
+ }
+} // end of wxWindow::OnPaint
+
bool wxWindowOS2::HandlePaint()
{
HRGN hRgn;
wxPaintEvent vEvent(m_windowId);
HPS hPS;
- RECTL vRect;
bool bProcessed;
// Create empty region
if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_ERROR)
{
- wxLogLastError("CreateRectRgn");
- return FALSE;
+ wxLogLastError(wxT("CreateRectRgn"));
+ return false;
+ }
+
+ // Get all the rectangles from the region, convert the individual
+ // rectangles to "the other" coordinate system and reassemble a
+ // region from the rectangles, to be feed into m_updateRegion.
+ //
+ // FIXME: This is a bad hack since OS/2 API specifies that rectangles
+ // passed into GpiSetRegion must not have Bottom > Top,
+ // however, at first sight, it _seems_ to work nonetheless.
+ //
+ RGNRECT vRgnData;
+ PRECTL pUpdateRects = NULL;
+ vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;
+ if (::GpiQueryRegionRects( hPS // Pres space
+ ,hRgn // Handle of region to query
+ ,NULL // Return all RECTs
+ ,&vRgnData // Will contain number or RECTs in region
+ ,NULL // NULL to return number of RECTs
+ ))
+ {
+ pUpdateRects = new RECTL[vRgnData.crcReturned];
+ vRgnData.crc = vRgnData.crcReturned;
+ vRgnData.ircStart = 1;
+ if (::GpiQueryRegionRects( hPS // Pres space of source
+ ,hRgn // Handle of source region
+ ,NULL // Return all RECTs
+ ,&vRgnData // Operations set to return rects
+ ,pUpdateRects // Will contain the actual RECTS
+ ))
+ {
+ int height;
+ RECT vRect;
+ ::WinQueryWindowRect(GetHwnd(), &vRect);
+ height = vRect.yTop;
+
+ for(size_t i = 0; i < vRgnData.crc; i++)
+ {
+ int rectHeight;
+ rectHeight = pUpdateRects[i].yTop - pUpdateRects[i].yBottom;
+ pUpdateRects[i].yTop = height - pUpdateRects[i].yTop;
+ pUpdateRects[i].yBottom = pUpdateRects[i].yTop + rectHeight;
+ }
+ ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects);
+ delete [] pUpdateRects;
+ }
}
m_updateRegion = wxRegion(hRgn, hPS);
{
//
// OS/2 needs to process this right here, not by the default proc
- // Window's default proc correctly paints everything, OS/2 does not!
+ // Window's default proc correctly paints everything, OS/2 does not.
+ // For decorative panels that typically have no children, we draw
+ // borders.
//
HPS hPS;
RECTL vRect;
- wxFrame* pFrame;
- wxWindow* pParent;
hPS = ::WinBeginPaint( GetHwnd()
,NULLHANDLE
,0L
,NULL
);
-
- ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
+ if (::WinIsWindowVisible(GetHWND()))
+ ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
if (m_dwExStyle)
{
- LINEBUNDLE vLineBundle;
+ LINEBUNDLE vLineBundle;
vLineBundle.lColor = 0x00000000; // Black
vLineBundle.usMixMode = FM_OVERPAINT;
,m_dwExStyle
);
}
- ::WinEndPaint(hPS);
}
- bProcessed = TRUE;
+ ::WinEndPaint(hPS);
+ bProcessed = true;
}
+ else if (!bProcessed &&
+ IsKindOf(CLASSINFO(wxPanel))
+ )
+ {
+ //
+ // Panel with children, usually fills a frame client so no borders.
+ //
+ HPS hPS;
+ RECTL vRect;
+
+ hPS = ::WinBeginPaint( GetHwnd()
+ ,NULLHANDLE
+ ,&vRect
+ );
+ if(hPS)
+ {
+ ::GpiCreateLogColorTable( hPS
+ ,0L
+ ,LCOLF_CONSECRGB
+ ,0L
+ ,(LONG)wxTheColourDatabase->m_nSize
+ ,(PLONG)wxTheColourDatabase->m_palTable
+ );
+ ::GpiCreateLogColorTable( hPS
+ ,0L
+ ,LCOLF_RGB
+ ,0L
+ ,0L
+ ,NULL
+ );
+ if (::WinIsWindowVisible(GetHWND()))
+ ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
+ }
+ ::WinEndPaint(hPS);
+ bProcessed = true;
+ }
return bProcessed;
} // end of wxWindowOS2::HandlePaint
-bool wxWindowOS2::HandleEraseBkgnd(
- WXHDC hDC
-)
+bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC )
{
- SWP vSwp;
- bool rc;
+ SWP vSwp;
+ bool rc;
::WinQueryWindowPos(GetHwnd(), &vSwp);
if (vSwp.fl & SWP_MINIMIZE)
- return TRUE;
+ return true;
- wxDC vDC;
+ wxDC vDC;
vDC.m_hPS = (HPS)hDC; // this is really a PS
vDC.SetWindow((wxWindow*)this);
vDC.BeginDrawing();
- wxEraseEvent vEvent(m_windowId, &vDC);
+ wxEraseEvent vEvent(m_windowId, &vDC);
vEvent.SetEventObject(this);
vDC.EndDrawing();
vDC.m_hPS = NULLHANDLE;
- return TRUE;
+ return true;
} // end of wxWindowOS2::HandleEraseBkgnd
-void wxWindowOS2::OnEraseBackground(
- wxEraseEvent& rEvent
-)
+void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
{
- RECTL vRect;
- HPS hPS = rEvent.m_dc->m_hPS;
- APIRET rc;
- LONG lColor = m_backgroundColour.GetPixel();
+ RECTL vRect;
+ HPS hPS = rEvent.GetDC()->GetHPS();
+ APIRET rc;
+ LONG lColor = m_backgroundColour.GetPixel();
rc = ::WinQueryWindowRect(GetHwnd(), &vRect);
rc = ::WinFillRect(hPS, &vRect, lColor);
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleMaximize
-bool wxWindowOS2::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 wxWindowOS2::HandleMove
-bool wxWindowOS2::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 wxWindowOS2::HandleSize
-bool wxWindowOS2::HandleGetMinMaxInfo(
- PSWP pSwp
-)
+bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp )
{
- bool bRc = FALSE;
POINTL vPoint;
switch(pSwp->fl)
break;
default:
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
} // end of wxWindowOS2::HandleGetMinMaxInfo
// ---------------------------------------------------------------------------
// command messages
// ---------------------------------------------------------------------------
-bool wxWindowOS2::HandleCommand(
- WXWORD wId
-, WXWORD wCmd
-, WXHWND hControl
-)
+bool wxWindowOS2::HandleCommand( WXWORD wId,
+ WXWORD wCmd,
+ WXHWND hControl )
{
#if wxUSE_MENUS_NATIVE
if (wxCurrentPopupMenu)
if (pWin)
return pWin->OS2Command(wCmd, wId);
- return FALSE;
+ return false;
} // end of wxWindowOS2::HandleCommand
-bool wxWindowOS2::HandleSysCommand(
- WXWPARAM wParam
-, WXLPARAM WXUNUSED(lParam)
-)
+bool wxWindowOS2::HandleSysCommand( WXWPARAM wParam,
+ WXLPARAM WXUNUSED(lParam) )
{
//
// 4 bits are reserved
case SC_MINIMIZE:
return HandleMinimize();
}
- return FALSE;
+ return false;
} // end of wxWindowOS2::HandleSysCommand
// ---------------------------------------------------------------------------
// mouse events
// ---------------------------------------------------------------------------
-//TODO!!! check against MSW
+//TODO: check against MSW
void wxWindowOS2::InitMouseEvent(
wxMouseEvent& rEvent
, int nX
, WXUINT uFlags
)
{
+ int nHeight;
+ DoGetSize(0, &nHeight);
rEvent.m_x = nX;
- rEvent.m_y = nY;
- rEvent.m_shiftDown = ((uFlags & VK_SHIFT) != 0);
- rEvent.m_controlDown = ((uFlags & VK_CTRL) != 0);
- rEvent.m_leftDown = ((uFlags & VK_BUTTON1) != 0);
- rEvent.m_middleDown = ((uFlags & VK_BUTTON3) != 0);
- rEvent.m_rightDown = ((uFlags & VK_BUTTON2) != 0);
+ // Convert to wxWidgets standard coordinate system!
+ rEvent.m_y = nHeight - nY;
+ rEvent.m_shiftDown = ((uFlags & KC_SHIFT) != 0);
+ rEvent.m_controlDown = ((uFlags & KC_CTRL) != 0);
+ rEvent.m_altDown = ((uFlags & KC_ALT) != 0);
+ rEvent.m_leftDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) &
+ 0x8000) != 0;
+ rEvent.m_middleDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) &
+ 0x8000) != 0;
+ rEvent.m_rightDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) &
+ 0x8000) != 0;
rEvent.SetTimestamp(s_currentMsg.time);
- rEvent.m_eventObject = this;
+ rEvent.SetEventObject(this);
+ rEvent.SetId(GetId());
#if wxUSE_MOUSEEVENT_HACK
m_lastMouseX = nX;
#endif // wxUSE_MOUSEEVENT_HACK
} // end of wxWindowOS2::InitMouseEvent
-bool wxWindowOS2::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
//
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);
+ bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+ if (!bProcessed)
+ {
+ HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR();
+
+ if (hCursor != NULLHANDLE)
+ {
+ ::WinSetPointer(HWND_DESKTOP, hCursor);
+ bProcessed = true;
+ }
+ }
+ }
+ return bProcessed;
} // end of wxWindowOS2::HandleMouseEvent
-bool wxWindowOS2::HandleMouseMove(
- int nX
-, int nY
-, WXUINT uFlags
-)
+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
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;
} // 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 wxWindowOS2::HandleChar(
- WXWPARAM 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)
{
// 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;
+ 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 = (int)wParam;
+ vId = SHORT1FROMMP(lParam);
if ((vId > 0) && (vId < 27))
{
switch (vId)
break;
default:
- bCtrlDown = TRUE;
- vId = vId + 'a' - 1;
+ bCtrlDown = true;
+ break;
}
}
}
else // we're called from WM_KEYDOWN
{
- vId = wxCharCodeOS2ToWX((int)wParam);
+ vId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
if (vId == 0)
- return FALSE;
+ return false;
}
- wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR
- ,vId
- ,lParam
- ));
+ wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR, vId, lParam ));
if (bCtrlDown)
{
- vEvent.m_controlDown = TRUE;
+ vEvent.m_controlDown = true;
}
+
return (GetEventHandler()->ProcessEvent(vEvent));
}
-bool wxWindowOS2::HandleKeyDown(
- WXWPARAM wParam
-, WXLPARAM lParam
-)
+bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam,
+ WXLPARAM lParam )
{
- int nId = wxCharCodeOS2ToWX((int)wParam);
+ int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
if (!nId)
{
//
// Normal ASCII char
//
- nId = (int)wParam;
+ nId = SHORT1FROMMP(lParam);
}
if (nId != -1)
{
- wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_DOWN
- ,nId
- ,(MPARAM)lParam
- ,(MPARAM)wParam
- ));
+ wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_DOWN
+ ,nId
+ ,(MPARAM)lParam
+ ,(MPARAM)wParam
+ ));
if (GetEventHandler()->ProcessEvent(vEvent))
{
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
} // end of wxWindowOS2::HandleKeyDown
-bool wxWindowOS2::HandleKeyUp(
- WXWPARAM wParam
-, WXLPARAM lParam
-)
+bool wxWindowOS2::HandleKeyUp( WXWPARAM wParam,
+ WXLPARAM lParam )
{
- int nId = wxCharCodeOS2ToWX((int)wParam);
+ int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
if (!nId)
{
//
// Normal ASCII char
//
- nId = (int)wParam;
+ nId = CHAR1FROMMP(lParam);
}
if (nId != -1)
{
- wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP
- ,nId
- ,lParam
- ,wParam
- ));
+ wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP
+ ,nId
+ ,(MPARAM)lParam
+ ,(MPARAM)wParam
+ ));
if (GetEventHandler()->ProcessEvent(vEvent))
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
} // end of wxWindowOS2::HandleKeyUp
// ---------------------------------------------------------------------------
// scrolling
// ---------------------------------------------------------------------------
-bool wxWindowOS2::OS2OnScroll(
- int nOrientation
-, WXWORD wParam
-, WXWORD wPos
-, WXHWND hControl
-)
+bool wxWindowOS2::OS2OnScroll( int nOrientation,
+ WXWORD wParam,
+ WXWORD wPos,
+ WXHWND hControl )
{
if (hControl)
{
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 GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::OS2OnScroll
int nDiff
)
{
- SWP vSwp;
-
- for (wxWindowList::Node* pNode = GetChildren().GetFirst();
- pNode;
- pNode = pNode->GetNext())
+ //
+ // We want to handle top levels ourself, manually
+ //
+ if (!IsTopLevel() && GetAutoLayout())
+ {
+ Layout();
+ }
+ else
{
- wxWindow* pWin = pNode->GetData();
+ SWP vSwp;
- ::WinQueryWindowPos( GetHwndOf(pWin)
- ,&vSwp
- );
- if (pWin->IsKindOf(CLASSINFO(wxControl)))
+ for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+ node;
+ node = node->GetNext())
{
- wxControl* pCtrl;
+ wxWindow* pWin = node->GetData();
- //
- // Must deal with controls that have margins like ENTRYFIELD. The SWP
- // struct of such a control will have and origin offset from its intended
- // position by the width of the margins.
- //
- pCtrl = wxDynamicCast(pWin, wxControl);
- vSwp.y -= pCtrl->GetYComp();
- vSwp.x -= pCtrl->GetXComp();
- }
- ::WinSetWindowPos( GetHwndOf(pWin)
- ,HWND_TOP
- ,vSwp.x
- ,vSwp.y - nDiff
- ,vSwp.cx
- ,vSwp.cy
- ,SWP_MOVE | SWP_SHOW | SWP_ZORDER
- );
- ::WinQueryWindowPos(GetHwndOf(pWin), pWin->GetSwp());
- if (pWin->IsKindOf(CLASSINFO(wxRadioBox)))
- {
- wxRadioBox* pRadioBox;
-
- pRadioBox = wxDynamicCast(pWin, wxRadioBox);
- pRadioBox->AdjustButtons( (int)vSwp.x
- ,(int)vSwp.y - nDiff
- ,(int)vSwp.cx
- ,(int)vSwp.cy
- ,pRadioBox->GetSizeFlags()
- );
- }
- if (pWin->IsKindOf(CLASSINFO(wxSlider)))
- {
- wxSlider* pSlider;
-
- pSlider = wxDynamicCast(pWin, wxSlider);
- pSlider->AdjustSubControls( (int)vSwp.x
- ,(int)vSwp.y - nDiff
- ,(int)vSwp.cx
- ,(int)vSwp.cy
- ,(int)pSlider->GetSizeFlags()
- );
+ ::WinQueryWindowPos( GetHwndOf(pWin)
+ ,&vSwp
+ );
+ // Actually, only move children that already are placed on the
+ // frame, not ones which are still at wxDefaultCoord.
+ if (vSwp.y == wxDefaultCoord)
+ continue;
+ if (pWin->IsKindOf(CLASSINFO(wxControl)))
+ {
+ wxControl* pCtrl;
+
+ //
+ // Must deal with controls that have margins like ENTRYFIELD. The SWP
+ // struct of such a control will have and origin offset from its intended
+ // position by the width of the margins.
+ //
+ pCtrl = wxDynamicCast(pWin, wxControl);
+ vSwp.y -= pCtrl->GetYComp();
+ vSwp.x -= pCtrl->GetXComp();
+ }
+ ::WinSetWindowPos( GetHwndOf(pWin)
+ ,HWND_TOP
+ ,vSwp.x
+ ,vSwp.y - nDiff
+ ,vSwp.cx
+ ,vSwp.cy
+ ,SWP_MOVE
+ );
+ ::WinQueryWindowPos(GetHwndOf(pWin), pWin->GetSwp());
+ if (pWin->IsKindOf(CLASSINFO(wxRadioBox)))
+ {
+ wxRadioBox* pRadioBox;
+
+ pRadioBox = wxDynamicCast(pWin, wxRadioBox);
+ pRadioBox->AdjustButtons( (int)vSwp.x
+ ,(int)vSwp.y - nDiff
+ ,(int)vSwp.cx
+ ,(int)vSwp.cy
+ ,pRadioBox->GetSizeFlags()
+ );
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxSlider)))
+ {
+ wxSlider* pSlider;
+
+ pSlider = wxDynamicCast(pWin, wxSlider);
+ pSlider->AdjustSubControls( (int)vSwp.x
+ ,(int)vSwp.y - nDiff
+ ,(int)vSwp.cx
+ ,(int)vSwp.cy
+ ,(int)pSlider->GetSizeFlags()
+ );
+ }
}
}
Refresh();
//
// Getting the Y position for a window, like a control, is a real
// pain. There are three sitatuions we must deal with in determining
-// the OS2 to wxWindows Y coordinate.
+// the OS2 to wxWidgets Y coordinate.
//
// 1) The controls are created in a dialog.
// This is the easiest since a dialog is created with its original
// as that will be the eventual size of the panel after the frame resizes
// it!
//
-int wxWindowOS2::GetOS2ParentHeight(
- wxWindowOS2* pParent
-)
+int wxWindowOS2::GetOS2ParentHeight( wxWindowOS2* pParent )
{
- wxWindowOS2* pGrandParent = NULL;
-
//
// Case 1
//
IsKindOf(CLASSINFO(wxMenuBar)) ||
IsKindOf(CLASSINFO(wxToolBar))
)
- return(pParent->GetSize().y);
+ {
+ 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);
}
// and it's height must be different. Otherwise the standard
// applies.
//
- else
- {
- return(pParent->GetClientSize().y);
- }
- return(0L);
+ // else
+ // {
+
+ return(pParent->GetClientSize().y);
+
+ // }
} // end of wxWindowOS2::GetOS2ParentHeight
//
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_PRIOR; break;
+ case VK_PAGEDOWN: nId = WXK_NEXT; break;
case VK_ESC: nId = WXK_ESCAPE; break;
case VK_END: nId = WXK_END; break;
case VK_HOME : nId = WXK_HOME; break;
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;
+ *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_PRIOR: nKeySym = VK_PAGEUP; break;
+ case WXK_NEXT : 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;
case WXK_SCROLL: nKeySym = VK_SCRLLOCK; break;
default:
{
- *bIsVirtual = FALSE;
+ *bIsVirtual = false;
nKeySym = nId;
break;
}
} // 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, "<unknown message = %d>", 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("<unknown message = %d>"), nMessage);
+ return s_szBuf.c_str();
+
} // end of wxGetMessageName
#endif // __WXDEBUG__
// Find the wxWindow at the current mouse position, returning the mouse
// position.
-wxWindow* wxFindWindowAtPointer(
- wxPoint& WXUNUSED(rPt)
-)
+wxWindow* wxFindWindowAtPointer(wxPoint& WXUNUSED(rPt))
{
return wxFindWindowAtPoint(wxGetMousePosition());
}
-wxWindow* wxFindWindowAtPoint(
- const wxPoint& rPt
-)
+wxWindow* wxFindWindowAtPoint(const wxPoint& rPt)
{
- POINTL vPt2;
+ 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;
+ 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
return wxPoint(vPt.x, vPt.y);
}
-wxWindowOS2* FindWindowForMouseEvent(
- wxWindow* pWin
-, short* pnX
-, short* pnY
-)
+wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin,
+ short* WXUNUSED(pnX),
+ short* WXUNUSED(pnY) )
{
- wxCHECK_MSG( pnX && pnY, pWin, _T("NULL pointer in FindWindowForMouseEvent") );
- POINTL vPoint = { *pnX, *pnY };
- HWND hWnd = GetHwndOf(pWin);
- HWND hWndUnderMouse;
+ HWND hWnd = GetHwndOf(pWin);
+ HWND hWndUnderMouse;
+ POINTL vPoint;
+ BOOL rcEnabled = FALSE;
+ BOOL rcVisible = FALSE;
- //
- // First try to find a non transparent child: this allows us to send events
- // to a static text which is inside a static box, for example
- //
-
- hWndUnderMouse = ::WinWindowFromPoint( hWnd
- ,&vPoint
- ,TRUE
- );
- if (!hWndUnderMouse || hWndUnderMouse == hWnd)
+ ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+ hWndUnderMouse = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE);
+ if (hWndUnderMouse != HWND_DESKTOP)
{
- //
- // Now try any child window at all
- //
- hWndUnderMouse = ::WinWindowFromPoint( HWND_DESKTOP
- ,&vPoint
- ,TRUE
- );
+ 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 &&
- ::WinIsWindowVisible(hWndUnderMouse) &&
- ::WinIsWindowEnabled(hWndUnderMouse))
+ rcVisible && rcEnabled)
{
- wxWindow* pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse);
+ wxWindow* pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse);
+
if (pWinUnderMouse)
{
- // translate the mouse coords to the other window coords
- pWin->ClientToScreen( (int*)pnX
- ,(int*)pnY
- );
- pWinUnderMouse->ScreenToClient( (int*)pnX
- ,(int*)pnY
- );
+ //
+ // Translate the mouse coords to the other window coords
+ //
pWin = pWinUnderMouse;
}
}
return pWin;
} // end of FindWindowForMouseEvent
-
projects / wxWidgets.git / blobdiff