From 9eae14d7bbfac8bd66d53d201c07febebfeef34c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 4 Oct 2012 22:49:30 +0000 Subject: [PATCH] Remove unneeded variable initializations in wxPM code. Closes #14724. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/fontutil.cpp | 5 ----- src/os2/frame.cpp | 3 +-- src/os2/listbox.cpp | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp index 088d4424f1..8a27bc1729 100644 --- a/src/os2/fontutil.cpp +++ b/src/os2/fontutil.cpp @@ -558,17 +558,12 @@ void wxOS2SelectMatchingFontByName( nIndex = 0; for(i = 0, nIs = 0; i < nNumFonts; i++) { - int nEmHeight = 0; - int nXHeight = 0; - anDiff[0] = wxGpiStrcmp((wxChar*)pFM[i].szFacename, zFontFaceName); anDiff[1] = abs(pFM[i].lEmHeight - nPointSize); anDiff[2] = abs(pFM[i].usWeightClass - usWeightClass); anDiff[3] = abs((pFM[i].fsSelection & 0x2f) - fsSelection); if(anDiff[0] == 0) { - nEmHeight = (int)pFM[i].lEmHeight; - nXHeight =(int)pFM[i].lXHeight; if( (nIs & 0x01) == 0) { nIs = 1; diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index 6f200c9dde..a872743ea2 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -1071,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: diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp index c3018a0314..6fa76670e7 100644 --- a/src/os2/listbox.cpp +++ b/src/os2/listbox.cpp @@ -263,7 +263,6 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, void **clientData, wxClientDataType type) { - long lIndex = 0; LONG lIndexType = 0; bool incrementPos = false; -- 2.45.2