X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..2df793f9f482688be754e8657ab733c9d4fcb010:/src/os2/mdi.cpp diff --git a/src/os2/mdi.cpp b/src/os2/mdi.cpp index c8cdaaec52..b0142bab68 100644 --- a/src/os2/mdi.cpp +++ b/src/os2/mdi.cpp @@ -127,7 +127,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent, long style, const wxString& name) { - m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON); + m_hDefaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON); m_clientWindow = NULL; m_currentChild = NULL; @@ -288,8 +288,7 @@ void wxMDIParentFrame::ActivatePrevious() // the MDI parent frame window proc // --------------------------------------------------------------------------- -MRESULT wxMDIParentFrame::OS2WindowProc(HWND hwnd, - WXUINT message, +MRESULT wxMDIParentFrame::OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { @@ -375,7 +374,7 @@ MRESULT wxMDIParentFrame::OS2WindowProc(HWND hwnd, } */ if ( !processed ) - rc = wxFrame::OS2WindowProc(hwnd, message, wParam, lParam); + rc = wxFrame::OS2WindowProc(message, wParam, lParam); return rc; } @@ -504,8 +503,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) return FALSE; } -MRESULT wxMDIParentFrame::OS2DefWindowProc(HWND hwnd, - WXUINT message, +MRESULT wxMDIParentFrame::OS2DefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { @@ -559,8 +557,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, long style, const wxString& name) { - m_defaultIcon = (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON - : wxDEFAULT_MDICHILDFRAME_ICON); + m_hDefaultIcon = (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON + : wxDEFAULT_MDICHILDFRAME_ICON); SetName(name); @@ -774,8 +772,7 @@ void wxMDIChildFrame::Activate() // MDI window proc and message handlers // --------------------------------------------------------------------------- -MRESULT wxMDIChildFrame::OS2WindowProc(HWND hwnd, - WXUINT message, +MRESULT wxMDIChildFrame::OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { @@ -836,7 +833,7 @@ MRESULT wxMDIChildFrame::OS2WindowProc(HWND hwnd, } */ if ( !processed ) - rc = wxFrame::OS2WindowProc(hwnd, message, wParam, lParam); + rc = wxFrame::OS2WindowProc(message, wParam, lParam); return rc; } @@ -987,7 +984,7 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) // MDI specific message translation/preprocessing // --------------------------------------------------------------------------- -MRESULT wxMDIChildFrame::OS2DefWindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +MRESULT wxMDIChildFrame::OS2DefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { // TODO /*