taskmgr: Make FillSolidRect2() and Draw3dRect2?() static.
Francois Gouget
fgouget at free.fr
Tue May 5 20:33:55 CDT 2009
---
programs/taskmgr/taskmgr.c | 10 ++--------
programs/taskmgr/taskmgr.h | 3 ---
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c
index b30ed8e..923a445 100644
--- a/programs/taskmgr/taskmgr.c
+++ b/programs/taskmgr/taskmgr.c
@@ -61,7 +61,7 @@ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr)
ExtTextOut(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL);
}
-void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr)
+static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr)
{
RECT rect;
@@ -73,7 +73,7 @@ void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr)
ExtTextOut(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL);
}
-void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight)
+static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight)
{
FillSolidRect2(hDC, x, y, cx - 1, 1, clrTopLeft);
FillSolidRect2(hDC, x, y, 1, cy - 1, clrTopLeft);
@@ -81,12 +81,6 @@ void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLO
FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight);
}
-void Draw3dRect2(HDC hDC, LPRECT lpRect, COLORREF clrTopLeft, COLORREF clrBottomRight)
-{
- Draw3dRect(hDC, lpRect->left, lpRect->top, lpRect->right - lpRect->left,
- lpRect->bottom - lpRect->top, clrTopLeft, clrBottomRight);
-}
-
void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y)
{
HDC hFontDC;
diff --git a/programs/taskmgr/taskmgr.h b/programs/taskmgr/taskmgr.h
index f6df582..ed220be 100644
--- a/programs/taskmgr/taskmgr.h
+++ b/programs/taskmgr/taskmgr.h
@@ -143,9 +143,6 @@ extern HWND hApplicationPageNewTaskButton; /* Application New Task button */
/* Forward declarations of functions included in this code module: */
void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr);
-void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr);
-void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight);
-void Draw3dRect2(HDC hDC, LPRECT lpRect, COLORREF clrTopLeft, COLORREF clrBottomRight);
void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y);
#define OPTIONS_MENU_INDEX 1
--
1.6.2.1
More information about the wine-patches
mailing list