From b437e4a5d53df8fcd892bb6e5582d0ded41e2580 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Tue, 28 Aug 2012 18:39:13 +0200
Subject: [PATCH] Synced TortoiseIDiff with TortoiseSVN

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseIDiff/AboutDlg.cpp | 21 ++++++++++++++++++++-
 src/TortoiseIDiff/MainWindow.h |  3 ++-
 src/TortoiseIDiff/PicWindow.h  | 14 +++++++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/TortoiseIDiff/AboutDlg.cpp b/src/TortoiseIDiff/AboutDlg.cpp
index 90ee41f12..886618224 100644
--- a/src/TortoiseIDiff/AboutDlg.cpp
+++ b/src/TortoiseIDiff/AboutDlg.cpp
@@ -1,3 +1,21 @@
+// TortoiseIDiff - an image diff viewer in TortoiseSVN
+
+// Copyright (C) 2012 - TortoiseSVN
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
 #include "StdAfx.h"
 #include "Resource.h"
 #include "AboutDlg.h"
@@ -9,8 +27,9 @@
 using namespace std;
 
 CAboutDlg::CAboutDlg(HWND hParent)
+    : m_hParent(hParent)
+    , m_hHiddenWnd(0)
 {
-    m_hParent = hParent;
 }
 
 CAboutDlg::~CAboutDlg(void)
diff --git a/src/TortoiseIDiff/MainWindow.h b/src/TortoiseIDiff/MainWindow.h
index fd5a9af44..8a562015f 100644
--- a/src/TortoiseIDiff/MainWindow.h
+++ b/src/TortoiseIDiff/MainWindow.h
@@ -1,6 +1,6 @@
 // TortoiseIDiff - an image diff viewer in TortoiseSVN
 
-// Copyright (C) 2006-2007,2009, 2011 - TortoiseSVN
+// Copyright (C) 2006-2007,2009, 2011-2012 - TortoiseSVN
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -50,6 +50,7 @@ public:
         , bFitSizes(false)
         , transparentColor(::GetSysColor(COLOR_WINDOW))
         , m_BlendType(CPicWindow::BLEND_ALPHA)
+        , hwndTB(0)
     {
         SetWindowTitle((LPCTSTR)ResString(hResource, IDS_APP_TITLE));
     };
diff --git a/src/TortoiseIDiff/PicWindow.h b/src/TortoiseIDiff/PicWindow.h
index 885b07d9f..913192681 100644
--- a/src/TortoiseIDiff/PicWindow.h
+++ b/src/TortoiseIDiff/PicWindow.h
@@ -1,6 +1,6 @@
 // TortoiseIDiff - an image diff viewer in TortoiseSVN
 
-// Copyright (C) 2006-2010 - TortoiseSVN
+// Copyright (C) 2006-2010, 2012 - TortoiseSVN
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -84,10 +84,22 @@ public:
         , startHScrollPos(0)
         , startVSecondScrollPos(0)
         , startHSecondScrollPos(0)
+        , hwndTT(0)
+        , hwndLeftBtn(0)
+        , hwndRightBtn(0)
+        , hwndPlayBtn(0)
+        , hwndAlphaToggleBtn(0)
+        , hLeft(0)
+        , hRight(0)
+        , hPlay(0)
+        , hStop(0)
+        , hAlphaToggle(0)
     {
         SetWindowTitle(_T("Picture Window"));
         m_lastTTPos.x = 0;
         m_lastTTPos.y = 0;
+        m_wszTip[0]   = 0;
+        m_szTip[0]    = 0;
     };
 
     enum BlendType
-- 
2.11.4.GIT