Make all instances of HasEditorCtrl() const, not just a few

[wxWidgets.git] / include / wx / settings.h

diff --git a/include/wx/settings.h b/include/wx/settings.h
index b956a5741d797e85c5b6c7f9fddba2f268d96c8a..8de41ae424b0b8009bfb287540bc78bfbe570ef0 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -29,7 +29,11 @@ enum wxSystemFont
     wxSYS_SYSTEM_FONT,
     wxSYS_DEVICE_DEFAULT_FONT,
 
     wxSYS_SYSTEM_FONT,
     wxSYS_DEVICE_DEFAULT_FONT,
 

-    // don't use: MSDN says that this is a stock object provided only 
+    // don't use: this is here just to make the values of enum elements
+    // coincide with the corresponding MSW constants
+    wxSYS_DEFAULT_PALETTE,
+
+    // don't use: MSDN says that this is a stock object provided only

     // for compatibility with 16-bit Windows versions earlier than 3.0!
     wxSYS_SYSTEM_FIXED_FONT,
 
     // for compatibility with 16-bit Windows versions earlier than 3.0!
     wxSYS_SYSTEM_FIXED_FONT,
 


@@ -78,6 +82,8 @@ enum wxSystemColour
     wxSYS_COLOUR_MENUBAR,
     wxSYS_COLOUR_LISTBOXTEXT,
 
     wxSYS_COLOUR_MENUBAR,
     wxSYS_COLOUR_LISTBOXTEXT,
 

+    wxSYS_COLOUR_MAX,
+

     // synonyms
     wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP,
     wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,
     // synonyms
     wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP,
     wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,


@@ -85,9 +91,7 @@ enum wxSystemColour
     wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
     wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
     wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
     wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
     wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
     wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,

-    wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE,
-
-    wxSYS_COLOUR_MAX
+    wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE

 };
 
 // possible values for wxSystemSettings::GetMetric() index parameter
 };
 
 // possible values for wxSystemSettings::GetMetric() index parameter