projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed broken 'hidden categories' mode (aka. alphabetic mode); Added distinct names...
[wxWidgets.git]
/
src
/
cocoa
/
brush.mm
diff --git
a/src/cocoa/brush.mm
b/src/cocoa/brush.mm
index c58fd7604bb4abd2fad825f8346ab94106129ad0..6a1bce5e7f87fc286e91944d2cfc195eece29a83 100644
(file)
--- a/
src/cocoa/brush.mm
+++ b/
src/cocoa/brush.mm
@@
-6,15
+6,17
@@
// Created: 2003/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
// Created: 2003/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence:
wxWindow
s licence
+// Licence:
wxWidget
s licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+
+#include "wx/brush.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
- #include "wx/
brush
.h"
+ #include "wx/
colour
.h"
#endif //WX_PRECOMP
#endif //WX_PRECOMP
-#include "wx/colour.h"
#import <AppKit/NSColor.h>
#import <AppKit/NSColor.h>
@@
-94,7
+96,7
@@
bool wxBrushRefData::operator==(const wxBrushRefData& data) const
// don't compare our NSColor
return m_style == data.m_style &&
m_colour == data.m_colour &&
// don't compare our NSColor
return m_style == data.m_style &&
m_colour == data.m_colour &&
- m_stipple
== data.m_stipple
;
+ m_stipple
.IsSameAs(data.m_stipple)
;
}
void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
}
void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
@@
-157,12
+159,12
@@
wxBrush::wxBrush(const wxBitmap& stipple)
m_refData = new wxBrushRefData(stipple);
}
m_refData = new wxBrushRefData(stipple);
}
-wx
ObjectRefData *wxBrush::Create
RefData() const
+wx
GDIRefData *wxBrush::CreateGDI
RefData() const
{
return new wxBrushRefData;
}
{
return new wxBrushRefData;
}
-wx
ObjectRefData *wxBrush::CloneRefData(const wxObject
RefData *data) const
+wx
GDIRefData *wxBrush::CloneGDIRefData(const wxGDI
RefData *data) const
{
return new wxBrushRefData(*(wxBrushRefData *)data);
}
{
return new wxBrushRefData(*(wxBrushRefData *)data);
}
@@
-215,4
+217,3
@@
WX_NSColor wxBrush::GetNSColor()
return [NSColor clearColor];
return M_BRUSHDATA->GetNSColor();
}
return [NSColor clearColor];
return M_BRUSHDATA->GetNSColor();
}
-