X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..404b319a85dadd7decf7a5a5331020520031a41c:/src/os2/frame.cpp?ds=sidebyside diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index bfa1f560b8..a872743ea2 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -52,8 +52,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) - // ============================================================================ // implementation // ============================================================================ @@ -854,7 +852,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; @@ -1073,9 +1071,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: @@ -1304,7 +1301,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;