]> git.saurik.com Git - wxWidgets.git/commitdiff
Remove unneeded variable initializations in wxPM code.
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 4 Oct 2012 22:49:30 +0000 (22:49 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 4 Oct 2012 22:49:30 +0000 (22:49 +0000)
Closes #14724.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/os2/fontutil.cpp
src/os2/frame.cpp
src/os2/listbox.cpp

index 088d4424f1d7931707c4aecda0a1bcddcaf0d2f6..8a27bc17295a84b48eca0cbad223d5697b08a111 100644 (file)
@@ -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;
index 6f200c9ddeb134ba9377bc15ff4f0a750bd2c73f..a872743ea25db80e4632936fd3b381a8e37258f2 100644 (file)
@@ -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:
index c3018a031408dbb7803661e77ca8437a0b1f1aa2..6fa76670e767fc08ecbb158f645d60f6c621ce1a 100644 (file)
@@ -263,7 +263,6 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
                              void **clientData,
                              wxClientDataType type)
 {
-    long lIndex = 0;
     LONG lIndexType = 0;
     bool incrementPos = false;