X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16b0c553987e18e1c28d03ba79111b62981287b0..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/msw/settings.cpp diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp index 84a4ee3348..4fbc2299f6 100644 --- a/src/msw/settings.cpp +++ b/src/msw/settings.cpp @@ -91,8 +91,7 @@ bool wxSystemSettingsModule::OnInit() void wxSystemSettingsModule::OnExit() { - delete gs_fontDefault; - gs_fontDefault = NULL; + wxDELETE(gs_fontDefault); } // ---------------------------------------------------------------------------- @@ -134,6 +133,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) // there is no standard colour with this index, map to another one index = wxSYS_COLOUR_WINDOWTEXT; } + else if ( index == wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT) + { + // there is no standard colour with this index, map to another one + index = wxSYS_COLOUR_HIGHLIGHTTEXT; + } else if ( index == wxSYS_COLOUR_LISTBOX ) { // there is no standard colour with this index, map to another one