projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compilation fix for OS/2.
[wxWidgets.git]
/
src
/
gtk1
/
brush.cpp
diff --git
a/src/gtk1/brush.cpp
b/src/gtk1/brush.cpp
index f2237b0a664a645e033467a54377bce2f6e9a386..3b9330bb1a42ded7ae74d126376f56db9b75a064 100644
(file)
--- a/
src/gtk1/brush.cpp
+++ b/
src/gtk1/brush.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/brush.cpp
+// Name: src/gtk
1
/brush.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-11,7
+11,10
@@
#include "wx/wxprec.h"
#include "wx/brush.h"
#include "wx/wxprec.h"
#include "wx/brush.h"
-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+#endif
#include <gdk/gdk.h>
#include <gdk/gdk.h>
@@
-38,7
+41,7
@@
public:
bool operator == (const wxBrushRefData& data) const
{
return (m_style == data.m_style &&
bool operator == (const wxBrushRefData& data) const
{
return (m_style == data.m_style &&
- m_stipple
== data.m_stipple
&&
+ m_stipple
.IsSameAs(data.m_stipple)
&&
m_colour == data.m_colour);
}
m_colour == data.m_colour);
}
@@
-137,7
+140,7
@@
void wxBrush::SetColour( const wxColour& col )
M_BRUSHDATA->m_colour = col;
}
M_BRUSHDATA->m_colour = col;
}
-void wxBrush::SetColour(
const unsigned char r, const unsigned char g, const
unsigned char b )
+void wxBrush::SetColour(
unsigned char r, unsigned char g,
unsigned char b )
{
AllocExclusive();
{
AllocExclusive();