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

Changed wxWindowBase foreground to use wxSystemSettings, and changed wxTextCtrl

Browse Source 
to only be grey for single-line read-only controls.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-01-13 14:26:30 +00:00
parent d1e418eaea
commit f6e4e9ea30
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/wincmn.cpp
View File

@@ -118,7 +118,9 @@ void wxWindowBase::InitBase()
wxSystemSettings settings; wxSystemSettings settings;
m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE); m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE);
m_foregroundColour = *wxBLACK; // TODO take this from sys settings too? // m_foregroundColour = *wxBLACK; // TODO take this from sys settings too?
m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
#if !defined(__WXMAC__) && !defined(__WXGTK__) #if !defined(__WXMAC__) && !defined(__WXGTK__)
m_font = *wxSWISS_FONT; // and this? m_font = *wxSWISS_FONT; // and this?
#else #else

4
src/msw/textctrl.cpp
View File

@@ -353,10 +353,8 @@ void wxTextCtrl::AdoptAttributesFromHWND()
void wxTextCtrl::SetupColours() void wxTextCtrl::SetupColours()
{ {
// FIXME why is bg colour not inherited from parent?
wxColour bkgndColour; wxColour bkgndColour;
if (IsEditable()) if (IsEditable() || (m_windowStyle & wxTE_MULTILINE))
bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW); bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
else else
bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);