projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed background color reference from light gray to assigned bkgd color
[wxWidgets.git]
/
src
/
mac
/
carbon
/
brush.cpp
diff --git
a/src/mac/carbon/brush.cpp
b/src/mac/carbon/brush.cpp
index 78f89baa34966c9fb550d3bad519c85b91bd3140..584646202033d17599bac8be0824dbffc6a7eaf8 100644
(file)
--- a/
src/mac/carbon/brush.cpp
+++ b/
src/mac/carbon/brush.cpp
@@
-1,27
+1,22
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: brush.cpp
+// Name:
src/mac/carbon/
brush.cpp
// Purpose: wxBrush
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Purpose: wxBrush
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence:
wxWidget
s licence
+// Licence:
wxWindow
s licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+#include "wx/wxprec.h"
-#include "wx/setup.h"
#include "wx/utils.h"
#include "wx/brush.h"
#include "wx/mac/private.h"
#include "wx/utils.h"
#include "wx/brush.h"
#include "wx/mac/private.h"
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-#endif
class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
{
class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
{
@@
-36,9
+31,9
@@
protected:
int m_style;
wxBitmap m_stipple ;
wxColour m_colour;
int m_style;
wxBitmap m_stipple ;
wxColour m_colour;
-
+
ThemeBrush m_macThemeBrush ;
ThemeBrush m_macThemeBrush ;
-
+
ThemeBackgroundKind m_macThemeBackground ;
Rect m_macThemeBackgroundExtent ;
};
ThemeBackgroundKind m_macThemeBackground ;
Rect m_macThemeBackgroundExtent ;
};
@@
-92,7
+87,7
@@
wxBrush::wxBrush(const wxBitmap& stipple)
M_BRUSHDATA->m_colour = *wxBLACK;
M_BRUSHDATA->m_stipple = stipple;
M_BRUSHDATA->m_colour = *wxBLACK;
M_BRUSHDATA->m_stipple = stipple;
-
+
if (M_BRUSHDATA->m_stipple.GetMask())
M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
else
if (M_BRUSHDATA->m_stipple.GetMask())
M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
else
@@
-101,7
+96,7
@@
wxBrush::wxBrush(const wxBitmap& stipple)
RealizeResource();
}
RealizeResource();
}
-wxBrush::wxBrush(ThemeBrush macThemeBrush )
+wxBrush::wxBrush(ThemeBrush macThemeBrush )
{
m_refData = new wxBrushRefData;
{
m_refData = new wxBrushRefData;
@@
-170,6
+165,9
@@
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 );
+ M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 ) ;
RealizeResource();
}
RealizeResource();
}
@@
-186,44
+184,44
@@
void wxBrush::MacSetThemeBackground(unsigned long macThemeBackground, const WXRE
bool wxBrush::RealizeResource()
{
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 )
- *(Rect*)extent = M_BRUSHDATA->m_macThemeBackgroundExtent ;
- return M_BRUSHDATA->m_macThemeBackground ;
- }
- else
- {
- return 0 ;
- }
+
if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground )
+
{
+
if ( extent )
+
*(Rect*)extent = M_BRUSHDATA->m_macThemeBackgroundExtent ;
+
return M_BRUSHDATA->m_macThemeBackground ;
+
}
+
else
+
{
+ return 0 ;
+
}
}
}
-short wxBrush::MacGetTheme() const
-{
- return (M_BRUSHDATA ? ( M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack);
+short wxBrush::MacGetTheme() const
+{
+ return (M_BRUSHDATA ? ( M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack);
}
}
-wxColour& wxBrush::GetColour() const
+wxColour& wxBrush::GetColour() const
{
return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour);
}
{
return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour);
}
-int wxBrush::GetStyle() const
-{
- return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0);
+int wxBrush::GetStyle() const
+{
+ return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0);
}
}
-wxBitmap *wxBrush::GetStipple() const
-{
- return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0);
+wxBitmap *wxBrush::GetStipple() const
+{
+ return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0);
}
}
-wxMacBrushKind wxBrush::MacGetBrushKind() const
-{
- return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
-}
\ No newline at end of file
+wxMacBrushKind wxBrush::MacGetBrushKind() const
+{
+ return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
+}