[USER32] Sync icontitle.c with Wine Staging 1.7.55. CORE-10536
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 27 Nov 2015 22:46:41 +0000 (22:46 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 27 Nov 2015 22:46:41 +0000 (22:46 +0000)
svn path=/trunk/; revision=70166

reactos/media/doc/README.WINE
reactos/win32ss/user/user32/controls/icontitle.c

index 8a4bc63..9580427 100644 (file)
@@ -296,7 +296,7 @@ User32 -
   reactos/win32ss/user/user32/controls/button.c    # Synced to WineStaging-1.7.37
   reactos/win32ss/user/user32/controls/combo.c     # Synced to WineStaging-1.7.37
   reactos/win32ss/user/user32/controls/edit.c      # Synced to WineStaging-1.7.55
-  reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.37
+  reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.55
   reactos/win32ss/user/user32/controls/listbox.c   # Synced to Wine-1_1_39
   reactos/win32ss/user/user32/controls/scrollbar.c # Forked
   reactos/win32ss/user/user32/controls/static.c    # Synced to Wine-1_1_39
index d8c9d9e..4948b82 100644 (file)
@@ -126,7 +126,7 @@ static BOOL ICONTITLE_Paint( HWND hwnd, HWND owner, HDC hDC, BOOL bActive )
 {
     RECT rect;
     HFONT hPrevFont;
-    HBRUSH hBrush = 0;
+    HBRUSH hBrush;
     COLORREF textColor = 0;
 
     if( bActive )
@@ -213,7 +213,7 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
        case WM_CLOSE:
             return 0;
        case WM_SHOWWINDOW:
-            if (wParam) ICONTITLE_SetTitlePos( hWnd, owner );
+             if (wParam) ICONTITLE_SetTitlePos( hWnd, owner );
             return 0;
        case WM_ERASEBKGND:
             if( GetWindowLongPtrW( owner, GWL_STYLE ) & WS_CHILD )