• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision29023 (tree)
Time2020-11-15 00:46:34
Authorstefankueng

Log Message

Merged revision(s) r29022 from trunk:
* move the "using namespace" from header to cpp.

Change Summary

Incremental Difference

--- branches/1.14.x/src/Utils/MiscUI/AeroControls.cpp (revision 29022)
+++ branches/1.14.x/src/Utils/MiscUI/AeroControls.cpp (revision 29023)
@@ -27,6 +27,7 @@
2727 #define _WIN32_WINNT_WINTHRESHOLD 0x0A00
2828 #define IsWindows10OrGreater() (IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN10), LOBYTE(_WIN32_WINNT_WIN10), 0))
2929 #endif
30+using namespace Gdiplus;
3031
3132
3233 enum ControlType
--- branches/1.14.x/src/Utils/MiscUI/AeroControls.h (revision 29022)
+++ branches/1.14.x/src/Utils/MiscUI/AeroControls.h (revision 29023)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2009-2010, 2014-2016 - TortoiseSVN
3+// Copyright (C) 2009-2010, 2014-2016, 2020 - 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
@@ -21,10 +21,9 @@
2121 #include "registry.h"
2222 #include <map>
2323 #pragma warning(push)
24-#pragma warning(disable: 4458) // declaration of 'xxx' hides class member
24+#pragma warning(disable : 4458) // declaration of 'xxx' hides class member
2525 #include <gdiplus.h>
2626 #pragma warning(pop)
27-using namespace Gdiplus;
2827
2928 class AeroControlBase
3029 {
@@ -41,23 +40,23 @@
4140
4241 private:
4342 static LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uidSubclass, DWORD_PTR dwRefData);
44- LRESULT StaticWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
45- LRESULT ButtonWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
46- LRESULT ProgressbarWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
43+ LRESULT StaticWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
44+ LRESULT ButtonWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
45+ LRESULT ProgressbarWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
4746
48- BOOL DetermineGlowSize(int *piSize, LPCWSTR pszClassIdList = NULL);
47+ BOOL DetermineGlowSize(int* piSize, LPCWSTR pszClassIdList = NULL);
4948 void DrawFocusRect(LPRECT prcFocus, HDC hdcPaint);
50- void DrawRect(LPRECT prc, HDC hdcPaint, DashStyle dashStyle, Color clr, REAL width) const;
51- void FillRect(LPRECT prc, HDC hdcPaint, Color clr) const;
52- int GetStateFromBtnState(LONG_PTR dwStyle, BOOL bHot, BOOL bFocus, LRESULT dwCheckState, int iPartId, BOOL bHasMouseCapture) const;
49+ void DrawRect(LPRECT prc, HDC hdcPaint, Gdiplus::DashStyle dashStyle, Gdiplus::Color clr, Gdiplus::REAL width) const;
50+ void FillRect(LPRECT prc, HDC hdcPaint, Gdiplus::Color clr) const;
51+ int GetStateFromBtnState(LONG_PTR dwStyle, BOOL bHot, BOOL bFocus, LRESULT dwCheckState, int iPartId, BOOL bHasMouseCapture) const;
5352 void PaintControl(HWND hWnd, HDC hdc, RECT* prc, bool bDrawBorder);
5453 void ScreenToClient(HWND hWnd, LPRECT lprc);
55- void DrawSolidWndRectOnParent(HWND hWnd, Color clr);
54+ void DrawSolidWndRectOnParent(HWND hWnd, Gdiplus::Color clr);
5655 void DrawEditBorder(HWND hWnd);
57- BOOL GetEditBorderColor(HWND hWnd, COLORREF *pClr);
58- void GetRoundRectPath(GraphicsPath *pPath, const Rect& r, int dia) const;
56+ BOOL GetEditBorderColor(HWND hWnd, COLORREF* pClr);
57+ void GetRoundRectPath(Gdiplus::GraphicsPath* pPath, const Gdiplus::Rect& r, int dia) const;
5958
60- CRegDWORD m_regEnableDWMFrame;
61- std::map<HWND, UINT_PTR> subclassedControls;
62- ULONG_PTR gdiplusToken;
59+ CRegDWORD m_regEnableDWMFrame;
60+ std::map<HWND, UINT_PTR> subclassedControls;
61+ ULONG_PTR gdiplusToken;
6362 };
Show on old repository browser