diff --git a/include/wx/defs.h b/include/wx/defs.h index 5052698504..1d43a41854 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1779,10 +1779,10 @@ enum wxStandardID wxID_ANY = -1, - /* all predefined ids are between wxID_LOWEST and wxID_HIGHEST */ - wxID_LOWEST = 4999, + /* all predefined ids are between wxID_LOWEST and wxID_HIGHEST (exclusive) */ + wxID_LOWEST = 5000, - wxID_OPEN, + wxID_OPEN = wxID_LOWEST, wxID_CLOSE, wxID_NEW, wxID_SAVE, @@ -1935,7 +1935,8 @@ enum wxStandardID /* IDs used by generic file ctrl (4 consecutive starting from this value) */ wxID_FILECTRL = 5950, - wxID_HIGHEST = 5999 + /* Lowest ID not reserved for standard wx IDs greater than wxID_LOWEST */ + wxID_HIGHEST = 6000 }; /* ---------------------------------------------------------------------------- */ diff --git a/interface/wx/defs.h b/interface/wx/defs.h index d8bda2b33f..9c002d5b94 100644 --- a/interface/wx/defs.h +++ b/interface/wx/defs.h @@ -591,11 +591,12 @@ enum wxStandardID /** Start of the range reserved for wxWidgets-defined IDs. - Don't define custom IDs in the range from wxID_LOWEST to wxID_HIGHEST. + Don't define custom IDs in the range from wxID_LOWEST to wxID_HIGHEST + (exclusive). */ - wxID_LOWEST = 4999, + wxID_LOWEST = 5000, - wxID_OPEN, + wxID_OPEN = wxID_LOWEST, wxID_CLOSE, wxID_NEW, wxID_SAVE, @@ -743,13 +744,14 @@ enum wxStandardID /** End of the range reserved for wxWidgets-defined IDs. - Don't define custom IDs in the range from wxID_LOWEST to wxID_HIGHEST. + Don't define custom IDs in the range from wxID_LOWEST to wxID_HIGHEST + (exclusive). When using an enum to define a number of custom IDs, assigning the - value of @c wxID_HIGHEST+1 to the first element ensures that none of + value of @c wxID_HIGHEST to the first element ensures that none of the enum elements will conflict with any standard IDs. */ - wxID_HIGHEST = 5999 + wxID_HIGHEST = 6000 }; /**