AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return int from wxGetWindowId(), not WORD, to ensure comparing it with wxWindowID elsewhere works correctly even for negative ids

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-11-23 02:03:15 +00:00
parent 276ee5334d
commit 6756a5f8ee
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/private.h
View File

@ -866,7 +866,7 @@ extern WXDLLEXPORT wxString wxGetWindowClass(WXHWND hWnd);
// get the window id (should be unsigned, hence this is not wxWindowID which // get the window id (should be unsigned, hence this is not wxWindowID which
// is, for mainly historical reasons, signed) // is, for mainly historical reasons, signed)
extern WXDLLEXPORT WXWORD wxGetWindowId(WXHWND hWnd); extern WXDLLEXPORT int wxGetWindowId(WXHWND hWnd);
// check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are // check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are
// different // different

4
src/msw/mdi.cpp
View File

@ -601,8 +601,8 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
wxWindow *child = node->GetData(); wxWindow *child = node->GetData();
if ( child->GetHWND() ) if ( child->GetHWND() )
{ {
long childId = wxGetWindowId(child->GetHWND()); int childId = wxGetWindowId(child->GetHWND());
if (childId == (long)id) if ( childId == (signed short)id )
{ {
::SendMessage( GetWinHwnd(GetClientWindow()), ::SendMessage( GetWinHwnd(GetClientWindow()),
WM_MDIACTIVATE, WM_MDIACTIVATE,

4
src/msw/utilsgui.cpp
View File

@ -293,9 +293,9 @@ wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd)
return str; return str;
} }
WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd) int WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
{ {
return (WXWORD)GetWindowLong((HWND)hWnd, GWL_ID); return ::GetWindowLong((HWND)hWnd, GWL_ID);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------