projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install wxUniv headers in make install and include wxUniv sources in make dist
[wxWidgets.git]
/
src
/
mac
/
carbon
/
stattext.cpp
diff --git
a/src/mac/carbon/stattext.cpp
b/src/mac/carbon/stattext.cpp
index 88b0edf3f9b5564cc832cbde0f6b70553a469857..2982b7c5c4be9b726a936966abb1003832fb3409 100644
(file)
--- a/
src/mac/carbon/stattext.cpp
+++ b/
src/mac/carbon/stattext.cpp
@@
-20,6
+20,7
@@
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/utils.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/utils.h"
+#include "wx/settings.h"
#include <stdio.h>
#include <stdio.h>
@@
-128,10
+129,17
@@
void wxStaticText::OnDraw( wxDC &dc )
if (m_width <= 0 || m_height <= 0)
return;
if (m_width <= 0 || m_height <= 0)
return;
- if ( !IsWindowHilited( MacGetRootWindow() ) )
+ if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) &&
+ ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
+ || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )
{
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
}
{
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
}
+ else
+ {
+ dc.SetTextForeground( GetForegroundColour() ) ;
+ }
+
wxString paragraph;
int i = 0 ;
wxString text = m_label;
wxString paragraph;
int i = 0 ;
wxString text = m_label;