Make wxEventLoop::AddSourceForFD() static.

[wxWidgets.git] / src / os2 / settings.cpp

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index 89f7710bdc1c8499cc4cc956c4d909c920485a87..484be7380c92ca6da48ffa3aea589eacd0d557bf 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -70,8 +70,7 @@ void wxSystemSettingsModule::OnExit()
 {
     sm_optionNames.Clear();
     sm_optionValues.Clear();
 {
     sm_optionNames.Clear();
     sm_optionValues.Clear();

-    delete gs_fontDefault;
-    gs_fontDefault = NULL;
+    wxDELETE(gs_fontDefault);

 }
 
 wxColour wxSystemSettingsNative::GetColour(
 }
 
 wxColour wxSystemSettingsNative::GetColour(


@@ -173,6 +172,7 @@ wxColour wxSystemSettingsNative::GetColour(
             break;
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             break;
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT:

+        case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:

             vSysClr = SYSCLR_HILITEFOREGROUND;
             break;
 
             vSysClr = SYSCLR_HILITEFOREGROUND;
             break;