Make wxSpinCtrlGeneric usable as wxDVC editor control.

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index b384ebb03478dae2d41b8a41b6eaf0e9fc42a2fd..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;
 


@@ -248,7 +248,7 @@ wxFont wxSystemSettingsNative::GetFont(
                               wxFONTWEIGHT_NORMAL   );
                 break;
         default:
                               wxFONTWEIGHT_NORMAL   );
                 break;
         default:

-                wxFAIL_MSG( _T("stock font not found") );
+                wxFAIL_MSG( wxT("stock font not found") );

                 return GetFont(wxSYS_ANSI_VAR_FONT);
     }
 
                 return GetFont(wxSYS_ANSI_VAR_FONT);
     }