X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f8090e092ec9e89165341501ab1dd494698ce40..dab73021272104a5997f43658831658d8a783474:/src/msw/mdi.cpp?ds=sidebyside diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 5a6f624b6d..d2df50dda8 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -68,8 +68,11 @@ extern wxMenu *wxCurrentPopupMenu; extern const wxChar *wxMDIFrameClassName; // from app.cpp extern const wxChar *wxMDIChildFrameClassName; extern const wxChar *wxMDIChildFrameClassNameNoRedraw; - +#ifdef __DIGITALMARS__ +extern "C" void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); +#else extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); +#endif extern void wxRemoveHandleAssociation(wxWindow *win); static HWND invalidHandle = 0; @@ -557,10 +560,10 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) if ( IsMdiCommandId(id) ) { - wxWindowList::Node* node = GetChildren().GetFirst(); + wxWindowList::Node *node = GetChildren().GetFirst(); while ( node ) { - wxWindow* child = node->GetData(); + wxWindow *child = node->GetData(); if ( child->GetHWND() ) { long childId = wxGetWindowId(child->GetHWND()); @@ -1245,14 +1248,18 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF { if (GetParent()) { - wxWindowList::Node* node = GetParent()->GetChildren().GetFirst(); + wxWindowList::Node *node = GetParent()->GetChildren().GetFirst(); while (node) { - wxWindow* child = node->GetData(); + wxWindow *child = node->GetData(); if (child->IsKindOf(CLASSINFO(wxMDIChildFrame))) { - HWND hWnd = (HWND) child->GetHWND(); - ::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE ); + ::RedrawWindow(GetHwndOf(child), + NULL, + NULL, + RDW_FRAME | + RDW_ALLCHILDREN | + RDW_INVALIDATE); } node = node->GetNext(); }