projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated project file
[wxWidgets.git]
/
src
/
msw
/
brush.cpp
diff --git
a/src/msw/brush.cpp
b/src/msw/brush.cpp
index f1109f4633f645a716f062dfa698dd05ac407640..29161607c3220ee41e9c3234a336dd2ac08a5d9b 100644
(file)
--- a/
src/msw/brush.cpp
+++ b/
src/msw/brush.cpp
@@
-13,7
+13,7
@@
// declarations
// ============================================================================
// declarations
// ============================================================================
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "brush.h"
#endif
#pragma implementation "brush.h"
#endif
@@
-149,9
+149,10
@@
void wxBrushRefData::Free()
}
}
}
}
-static int TransllateHatchStyle(int style)
-{
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+
+static int TranslateHatchStyle(int style)
+{
switch ( style )
{
case wxBDIAGONAL_HATCH: return HS_BDIAGONAL;
switch ( style )
{
case wxBDIAGONAL_HATCH: return HS_BDIAGONAL;
@@
-162,19
+163,18
@@
static int TransllateHatchStyle(int style)
case wxVERTICAL_HATCH: return HS_VERTICAL;
default: return -1;
}
case wxVERTICAL_HATCH: return HS_VERTICAL;
default: return -1;
}
-#else // __WXMICROWIN__
- return -1;
-#endif
}
}
+#endif // !__WXMICROWIN__ && !__WXWINCE__
+
HBRUSH wxBrushRefData::GetHBRUSH()
{
if ( !m_hBrush )
{
HBRUSH wxBrushRefData::GetHBRUSH()
{
if ( !m_hBrush )
{
-#if
ndef __WXWINCE__
- int hatchStyle = Transl
l
ateHatchStyle(m_style);
+#if
!defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+ int hatchStyle = TranslateHatchStyle(m_style);
if ( hatchStyle == -1 )
if ( hatchStyle == -1 )
-#endif
+#endif
// !__WXMICROWIN__ && !__WXWINCE__
{
switch ( m_style )
{
{
switch ( m_style )
{
@@
-248,7
+248,7
@@
wxBrush::~wxBrush()
wxBrush& wxBrush::operator=(const wxBrush& brush)
{
wxBrush& wxBrush::operator=(const wxBrush& brush)
{
- if (
*this !=
brush )
+ if (
this != &
brush )
{
Ref(brush);
}
{
Ref(brush);
}