Skip to content

Commit ec10d6c

Browse files
committed
Fixed a couple of warnings, and a small bug
1 parent e2ecc40 commit ec10d6c

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

MakeWindowTransparent.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef DWORD (WINAPI *PSLWA)(HWND, DWORD, BYTE, DWORD);
3434
static PSLWA pSetLayeredWindowAttributes = NULL;
3535
static BOOL initialized = FALSE;
3636

37-
bool MakeWindowTransparent(HWND hWnd, long key, const unsigned char factor)
37+
BOOL MakeWindowTransparent(HWND hWnd, long key, const unsigned char factor)
3838
{
3939
/* First, see if we can get the API call we need. If we've tried
4040
* once, we don't need to try again. */
@@ -77,7 +77,7 @@ bool MakeWindowTransparent(HWND hWnd, long key, const unsigned char factor)
7777
flags);
7878
}
7979

80-
bool MakeWindowTransparent(CWnd *w, long key, const unsigned char factor)
80+
BOOL MakeWindowTransparent(CWnd *w, long key, const unsigned char factor)
8181
{
8282
HWND wnd = w->GetSafeHwnd();
8383

MakeWindowTransparent.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define MWT_MIN_FACTOR (0)
1717
#define MWT_MAX_FACTOR (0xFF)
1818

19-
bool MakeWindowTransparent(HWND hWnd, long key, const unsigned char factor);
20-
bool MakeWindowTransparent(CWnd *w, long key, const unsigned char factor);
19+
BOOL MakeWindowTransparent(HWND hWnd, long key, const unsigned char factor);
20+
BOOL MakeWindowTransparent(CWnd *w, long key, const unsigned char factor);
2121

2222
#endif // __MAKEWINDOWTRANSPARENT_H

ProcessPreviousLine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ assemble the full text of the original line.
746746
if (!m_LineList.IsEmpty ())
747747
{
748748
m_pCurrentLine = m_LineList.GetTail ();
749-
if ((m_pCurrentLine->flags & COMMENT == 0) ||
749+
if (((m_pCurrentLine->flags & COMMENT) == 0) ||
750750
m_pCurrentLine->hard_return)
751751
m_pCurrentLine = NULL;
752752
}

dialogs/ColourPickerDlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ float fLuminance = clr.GetLuminance ();
385385
m_ctlGreen.SetWindowText (CFormat ("%i", iGreen));
386386
m_ctlBlue.SetWindowText (CFormat ("%i", iBlue));
387387

388-
m_ctlHue.SetWindowText (CFormat ("Hue: %5.1f", fHue));
388+
m_ctlHue.SetWindowText (TFormat ("Hue: %5.1f", fHue));
389389
m_ctlSaturation.SetWindowText (TFormat ("Saturation: %5.3f", fSaturation));
390390
m_ctlLuminance.SetWindowText (TFormat ("Luminance: %5.3f", fLuminance));
391391

stdafx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#pragma warning (disable : 4663) // C++ language change: to explicitly specialize class template yadda yadda
2121
#pragma warning (disable : 4706) // assignment within conditional expression
2222
#pragma warning (disable : 4786) // identifier was truncated to 'number' characters in the debug information
23-
#pragma warning (disable : 4800) // forcing value to bool 'true' or 'false' (performance warning)
2423

2524

2625
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers

0 commit comments

Comments
 (0)