Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added GAUGE standard colour and use it in DrawProgressBar() if the colour

Browse Source 
hadn't bee nset explicitly


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-04 16:34:22 +00:00
parent e269a9be19
commit a407ff6ae8
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/univ/colschem.h
View File

@@ -66,6 +66,9 @@ public:
TITLEBAR_TEXT, TITLEBAR_TEXT,
TITLEBAR_ACTIVE_TEXT, TITLEBAR_ACTIVE_TEXT,
// the default gauge fill colour
GAUGE,
// desktop background colour (only used by framebuffer ports) // desktop background colour (only used by framebuffer ports)
DESKTOP, DESKTOP,

4
src/univ/renderer.cpp
View File

@@ -771,7 +771,9 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
wxRect rect = m_rect; wxRect rect = m_rect;
rect.Deflate(1); // FIXME this depends on the border width rect.Deflate(1); // FIXME this depends on the border width
m_dc.SetBrush(wxBrush(m_window->GetForegroundColour(), wxSOLID)); wxColour col = m_window->UseFgCol() ? m_window->GetForegroundColour()
: wxTHEME_COLOUR(GAUGE);
m_dc.SetBrush(wxBrush(col, wxSOLID));
if ( gauge->IsSmooth() ) if ( gauge->IsSmooth() )
{ {

2
src/univ/themes/gtk.cpp
View File

@@ -763,6 +763,8 @@ wxColour wxGTKColourScheme::Get(wxGTKColourScheme::StdColour col) const
case HIGHLIGHT: return wxColour(0x9c0000); case HIGHLIGHT: return wxColour(0x9c0000);
case HIGHLIGHT_TEXT: return wxColour(0xffffff); case HIGHLIGHT_TEXT: return wxColour(0xffffff);
case GAUGE: return Get(CONTROL_CURRENT);
case MAX: case MAX:
default: default:
wxFAIL_MSG(_T("invalid standard colour")); wxFAIL_MSG(_T("invalid standard colour"));

4
src/univ/themes/win32.cpp
View File

@@ -1297,7 +1297,7 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
#if defined(COLOR_3DDKSHADOW) #if defined(COLOR_3DDKSHADOW)
case SHADOW_DARK: return wxColour(GetSysColor(COLOR_3DDKSHADOW)); case SHADOW_DARK: return wxColour(GetSysColor(COLOR_3DDKSHADOW));
#else #else
case SHADOW_DARK: return *wxBLACK; case SHADOW_DARK: return wxColour(GetSysColor(COLOR_3DHADOW));
#endif #endif
case CONTROL_TEXT_DISABLED: case CONTROL_TEXT_DISABLED:
@@ -1348,6 +1348,8 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
case DESKTOP: return wxColour(0x808000); case DESKTOP: return wxColour(0x808000);
#endif // __WXMSW__ #endif // __WXMSW__
case GAUGE: return Get(HIGHLIGHT);
case MAX: case MAX:
default: default:
wxFAIL_MSG(_T("invalid standard colour")); wxFAIL_MSG(_T("invalid standard colour"));