• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28314 (tree)
Time2018-07-24 02:17:31
Authorstefankueng

Log Message

remove unused method.

Change Summary

Incremental Difference

--- trunk/src/TortoiseMerge/BaseView.cpp (revision 28313)
+++ trunk/src/TortoiseMerge/BaseView.cpp (revision 28314)
@@ -4505,19 +4505,6 @@
45054505 }
45064506 }
45074507
4508-HICON CBaseView::LoadIcon(WORD iconId)
4509-{
4510- int iconWidth = GetSystemMetrics(SM_CXSMICON);
4511- int iconHeight = GetSystemMetrics(SM_CYSMICON);
4512- HICON hIcon = nullptr;
4513- if (FAILED(LoadIconWithScaleDown(AfxGetResourceHandle(), MAKEINTRESOURCE(iconId), iconWidth, iconHeight, &hIcon)))
4514- {
4515- hIcon = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(iconId),
4516- IMAGE_ICON, iconWidth, iconHeight, LR_DEFAULTCOLOR);
4517- }
4518- return hIcon;
4519-}
4520-
45214508 void CBaseView::ReleaseBitmap()
45224509 {
45234510 if (m_pCacheBitmap)
--- trunk/src/TortoiseMerge/BaseView.h (revision 28313)
+++ trunk/src/TortoiseMerge/BaseView.h (revision 28314)
@@ -1,6 +1,6 @@
1-// TortoiseMerge - a Diff/Patch program
1+// TortoiseMerge - a Diff/Patch program
22
3-// Copyright (C) 2003-2015, 2017 - TortoiseSVN
3+// Copyright (C) 2003-2015, 2017-2018 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -462,7 +462,6 @@
462462 virtual void AddContextItems(CIconMenu& popup, DiffStates state);
463463 void AddCutCopyAndPaste(CIconMenu& popup);
464464 void CompensateForKeyboard(CPoint& point);
465- static HICON LoadIcon(WORD iconId);
466465 void ReleaseBitmap();
467466 static bool LinesInOneChange( int direction, DiffStates firstLineState, DiffStates currentLineState );
468467 static void FilterWhitespaces(CString& first, CString& second);
Show on old repository browser