X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..92c0fc34c104c8d7c12d6a3b78ea232690fc23f4:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index dfccb2ccad..b37f58f2bb 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/27/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -852,7 +851,7 @@ bool wxFrame::HandlePaint() const wxIcon& vIcon = GetIcon(); HPOINTER hIcon; - if (vIcon.Ok()) + if (vIcon.IsOk()) hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L); else hIcon = (HPOINTER)m_hDefaultIcon; @@ -1071,9 +1070,8 @@ MRESULT EXPENTRY wxFrameMainWndProc( HWND hWnd, { MRESULT rc = (MRESULT)0; bool bProcessed = false; - wxFrame* pWnd = NULL; - pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); + wxFrame* pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); switch (ulMsg) { case WM_QUERYFRAMECTLCOUNT: @@ -1302,7 +1300,7 @@ MRESULT wxFrame::OS2WindowProc( WXUINT uMessage, const wxIcon& vIcon = GetIcon(); HPOINTER hIcon; - if (vIcon.Ok()) + if (vIcon.IsOk()) hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L); else hIcon = (HPOINTER)m_hDefaultIcon;