projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fixed library names generated by wx-config for OS/2's PM port.
[wxWidgets.git]
/
src
/
mac
/
carbon
/
brush.cpp
diff --git
a/src/mac/carbon/brush.cpp
b/src/mac/carbon/brush.cpp
index f94401052f07bf9c12efe29beb96938b13c58c8d..789be90f00b9ccc91e04daf49f01c63acd8ba3c1 100644
(file)
--- a/
src/mac/carbon/brush.cpp
+++ b/
src/mac/carbon/brush.cpp
@@
-9,11
+9,12
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "brush.h"
#endif
#pragma implementation "brush.h"
#endif
-#include "wx/setup.h"
+#include "wx/wxprec.h"
+
#include "wx/utils.h"
#include "wx/brush.h"
#include "wx/utils.h"
#include "wx/brush.h"
@@
-170,7
+171,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 );
+ M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 ) ;
+
RealizeResource();
}
RealizeResource();
}
@@
-226,4
+230,4
@@
wxBitmap *wxBrush::GetStipple() const
wxMacBrushKind wxBrush::MacGetBrushKind() const
{
return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
wxMacBrushKind wxBrush::MacGetBrushKind() const
{
return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
-}
\ No newline at end of file
+}