projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid an assert if no alignment style is specified
[wxWidgets.git]
/
src
/
mac
/
carbon
/
brush.cpp
diff --git
a/src/mac/carbon/brush.cpp
b/src/mac/carbon/brush.cpp
index b7ada08a6d5dd3fef1f90084faba8e90a3a3186d..4f56a3a6146f7bd4eef5b35c0836f35a242bc356 100644
(file)
--- a/
src/mac/carbon/brush.cpp
+++ b/
src/mac/carbon/brush.cpp
@@
-11,9
+11,12
@@
#include "wx/wxprec.h"
#include "wx/wxprec.h"
-#include "wx/utils.h"
#include "wx/brush.h"
#include "wx/brush.h"
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+#endif
+
#include "wx/mac/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
#include "wx/mac/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
@@
-21,6
+24,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
{
friend class WXDLLEXPORT wxBrush;
class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
{
friend class WXDLLEXPORT wxBrush;
+
public:
wxBrushRefData();
wxBrushRefData(const wxBrushRefData& data);
public:
wxBrushRefData();
wxBrushRefData(const wxBrushRefData& data);
@@
-40,6
+44,7
@@
protected:
#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
+
wxBrushRefData::wxBrushRefData()
: m_style(wxSOLID)
{
wxBrushRefData::wxBrushRefData()
: m_style(wxSOLID)
{
@@
-62,7
+67,6
@@
wxBrushRefData::~wxBrushRefData()
{
}
{
}
-// Brushes
wxBrush::wxBrush()
{
}
wxBrush::wxBrush()
{
}
@@
-96,7
+100,7
@@
wxBrush::wxBrush(const wxBitmap& stipple)
RealizeResource();
}
RealizeResource();
}
-wxBrush::wxBrush(ThemeBrush macThemeBrush )
+wxBrush::wxBrush(
ThemeBrush macThemeBrush )
{
m_refData = new wxBrushRefData;
{
m_refData = new wxBrushRefData;
@@
-105,6
+109,7
@@
wxBrush::wxBrush(ThemeBrush macThemeBrush )
RealizeResource();
}
RealizeResource();
}
+
void wxBrush::Unshare()
{
// Don't change shared data
void wxBrush::Unshare()
{
// Don't change shared data
@@
-129,7
+134,7
@@
void wxBrush::SetColour(const wxColour& col)
RealizeResource();
}
RealizeResource();
}
-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)
{
Unshare();
{
Unshare();
@@
-165,9
+170,10
@@
void wxBrush::MacSetTheme(ThemeBrush macThemeBrush)
M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
+
RGBColor color ;
GetThemeBrushAsColor( macThemeBrush , 32, true, &color );
RGBColor color ;
GetThemeBrushAsColor( macThemeBrush , 32, true, &color );
- M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 )
;
+ M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 );
RealizeResource();
}
RealizeResource();
}
@@
-178,7
+184,8
@@
void wxBrush::MacSetThemeBackground(unsigned long macThemeBackground, const WXRE
M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
- M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent ;
+ M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent;
+
RealizeResource();
}
RealizeResource();
}
@@
-187,23
+194,24
@@
bool wxBrush::RealizeResource()
return true;
}
return true;
}
-unsigned long wxBrush::MacGetThemeBackground(
WXRECTPTR extent)
const
+unsigned long wxBrush::MacGetThemeBackground(
WXRECTPTR extent)
const
{
if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground )
{
if ( extent )
{
if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground )
{
if ( extent )
- *(Rect*)extent = M_BRUSHDATA->m_macThemeBackgroundExtent ;
- return M_BRUSHDATA->m_macThemeBackground ;
+ *(Rect*)extent = M_BRUSHDATA->m_macThemeBackgroundExtent;
+
+ return M_BRUSHDATA->m_macThemeBackground;
}
else
{
}
else
{
- return 0
;
+ return 0;
}
}
short wxBrush::MacGetTheme() const
{
}
}
short wxBrush::MacGetTheme() const
{
- return (M_BRUSHDATA ? (
M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme
? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack);
+ return (M_BRUSHDATA ? (
(M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme)
? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack);
}
wxColour& wxBrush::GetColour() const
}
wxColour& wxBrush::GetColour() const
@@
-221,7
+229,7
@@
wxBitmap *wxBrush::GetStipple() const
return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0);
}
return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0);
}
-wxMacBrushKind wxBrush::MacGetBrushKind()
const
+wxMacBrushKind wxBrush::MacGetBrushKind() const
{
return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
}
{
return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
}