From 9c76bc27c0f8a2d47f67177c9777899983cc0b1a Mon Sep 17 00:00:00 2001 From: Blake Madden Date: Thu, 27 Oct 2022 14:34:47 -0400 Subject: [PATCH] Use wxID_HIGHEST instead of wxID_HIGHEST+1 in samples There is no need to add 1 any more since the changes of 99c52403f9 (Use usual half-open interval for wxID_LOWEST..wxID_HIGHEST, 2022-10-23), so don't. Closes #22923. --- samples/artprov/arttest.cpp | 2 +- samples/aui/auidemo.cpp | 4 ++-- samples/dataview/dataview.cpp | 2 +- samples/display/display.cpp | 2 +- samples/font/font.cpp | 2 +- samples/image/image.cpp | 2 +- samples/internat/internat.cpp | 2 +- samples/opengl/cube/cube.cpp | 2 +- samples/opengl/cube/cube.h | 2 +- samples/opengl/pyramid/pyramid.h | 2 +- samples/propgrid/propgrid_minimal.cpp | 2 +- samples/ribbon/ribbondemo.cpp | 2 +- samples/sound/sound.cpp | 2 +- samples/splash/splash.cpp | 2 +- samples/statbar/statbar.cpp | 2 +- samples/thread/thread.cpp | 2 +- samples/vscroll/vstest.cpp | 2 +- samples/xrc/custclas.cpp | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp index e0f37003f0..d4f6abef06 100644 --- a/samples/artprov/arttest.cpp +++ b/samples/artprov/arttest.cpp @@ -60,7 +60,7 @@ private: enum { ID_Quit = wxID_EXIT, - ID_Logs = wxID_HIGHEST+1, + ID_Logs = wxID_HIGHEST, ID_Browser, ID_PlugProvider }; diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index 950bf1c7da..024fb1eb4f 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -54,7 +54,7 @@ class MyFrame : public wxFrame { enum { - ID_CreateTree = wxID_HIGHEST+1, + ID_CreateTree = wxID_HIGHEST, ID_CreateGrid, ID_CreateText, ID_CreateHTML, @@ -260,7 +260,7 @@ class SettingsPanel : public wxPanel { enum { - ID_PaneBorderSize = wxID_HIGHEST+1, + ID_PaneBorderSize = wxID_HIGHEST, ID_SashSize, ID_CaptionSize, ID_BackgroundColor, diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 1560ab8bd1..8b790ed2e7 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -397,7 +397,7 @@ bool MyApp::OnInit() enum { - ID_CLEARLOG = wxID_HIGHEST+1, + ID_CLEARLOG = wxID_HIGHEST, ID_GET_PAGE_INFO, ID_HIT_TEST, ID_DISABLE, diff --git a/samples/display/display.cpp b/samples/display/display.cpp index cd54c683df..4f175bc877 100644 --- a/samples/display/display.cpp +++ b/samples/display/display.cpp @@ -116,7 +116,7 @@ public: enum { // menu items - Display_FromPoint = wxID_HIGHEST + 1, + Display_FromPoint = wxID_HIGHEST, Display_FullScreen, Display_ContentProtection_None, Display_ContentProtection_Enable, diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 6c0093e6f2..b2d192c646 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -267,7 +267,7 @@ enum Font_Quit = wxID_EXIT, Font_About = wxID_ABOUT, - Font_ViewMsg = wxID_HIGHEST+1, + Font_ViewMsg = wxID_HIGHEST, Font_TestTextValue, Font_IncSize, diff --git a/samples/image/image.cpp b/samples/image/image.cpp index d65e48ce10..559ea2c868 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -124,7 +124,7 @@ private: enum { - ID_ROTATE_LEFT = wxID_HIGHEST+1, + ID_ROTATE_LEFT = wxID_HIGHEST, ID_ROTATE_RIGHT, ID_RESIZE, ID_ZOOM_x2, diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index db6dbf1035..3a940f084a 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -109,7 +109,7 @@ public: // ID for the menu commands enum { - INTERNAT_TEST = wxID_HIGHEST + 1, + INTERNAT_TEST = wxID_HIGHEST, INTERNAT_PLAY, INTERNAT_TEST_1, INTERNAT_TEST_2, diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp index 77cc734837..83fe9bab0f 100644 --- a/samples/opengl/cube/cube.cpp +++ b/samples/opengl/cube/cube.cpp @@ -41,7 +41,7 @@ // control ids enum { - SpinTimer = wxID_HIGHEST + 1 + SpinTimer = wxID_HIGHEST }; // ---------------------------------------------------------------------------- diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h index 4f9bd0d280..02d0eb0d75 100644 --- a/samples/opengl/cube/cube.h +++ b/samples/opengl/cube/cube.h @@ -86,7 +86,7 @@ private: enum { - NEW_STEREO_WINDOW = wxID_HIGHEST + 1 + NEW_STEREO_WINDOW = wxID_HIGHEST }; #endif // _WX_CUBE_H_ diff --git a/samples/opengl/pyramid/pyramid.h b/samples/opengl/pyramid/pyramid.h index 64a8d5938d..7f84b22a79 100644 --- a/samples/opengl/pyramid/pyramid.h +++ b/samples/opengl/pyramid/pyramid.h @@ -81,7 +81,7 @@ enum { Pyramid_Quit = wxID_EXIT, Pyramid_About = wxID_ABOUT, - Pyramid_LogW = wxID_HIGHEST + 10 + Pyramid_LogW = wxID_HIGHEST }; #endif // PYRSAMLE_H diff --git a/samples/propgrid/propgrid_minimal.cpp b/samples/propgrid/propgrid_minimal.cpp index 0438930607..72a14e0506 100644 --- a/samples/propgrid/propgrid_minimal.cpp +++ b/samples/propgrid/propgrid_minimal.cpp @@ -28,7 +28,7 @@ private: enum { - ID_ACTION = wxID_HIGHEST+1 + ID_ACTION = wxID_HIGHEST }; wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp index fdf793baf0..9d98061475 100644 --- a/samples/ribbon/ribbondemo.cpp +++ b/samples/ribbon/ribbondemo.cpp @@ -49,7 +49,7 @@ public: enum { - ID_CIRCLE = wxID_HIGHEST + 1, + ID_CIRCLE = wxID_HIGHEST, ID_CROSS, ID_TRIANGLE, ID_SQUARE, diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp index 1c111ca55a..b24d8784fe 100644 --- a/samples/sound/sound.cpp +++ b/samples/sound/sound.cpp @@ -101,7 +101,7 @@ private: enum { // menu items - Sound_SelectFile = wxID_HIGHEST + 1, + Sound_SelectFile = wxID_HIGHEST, #ifdef __WXMSW__ Sound_SelectResource, #endif // __WXMSW__ diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp index 420b0f4189..c59fd1ebec 100644 --- a/samples/splash/splash.cpp +++ b/samples/splash/splash.cpp @@ -88,7 +88,7 @@ private: // IDs for the controls and the menu commands enum { - Minimal_Run = wxID_HIGHEST + 1 + Minimal_Run = wxID_HIGHEST }; // ---------------------------------------------------------------------------- diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index 6da2419db4..0887f1b027 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -198,7 +198,7 @@ enum StatusBar_Quit = wxID_EXIT, StatusBar_About = wxID_ABOUT, - StatusBar_SetFields = wxID_HIGHEST+1, + StatusBar_SetFields = wxID_HIGHEST, StatusBar_SetField, StatusBar_SetText, StatusBar_PushText, diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp index 381738f624..aa235126bf 100644 --- a/samples/thread/thread.cpp +++ b/samples/thread/thread.cpp @@ -195,7 +195,7 @@ enum THREAD_SHOWCPUS, - WORKER_EVENT = wxID_HIGHEST+1, // this one gets sent from MyWorkerThread + WORKER_EVENT = wxID_HIGHEST, // this one gets sent from MyWorkerThread GUITHREAD_EVENT // this one gets sent from MyGUIThread }; diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp index 00c14e5023..51ea61b2b4 100644 --- a/samples/vscroll/vstest.cpp +++ b/samples/vscroll/vstest.cpp @@ -431,7 +431,7 @@ enum // (where it is special and put into the "Apple" menu) VScroll_About = wxID_ABOUT, - VScroll_VScrollMode = wxID_HIGHEST + 1, + VScroll_VScrollMode = wxID_HIGHEST, VScroll_HScrollMode, VScroll_HVScrollMode }; diff --git a/samples/xrc/custclas.cpp b/samples/xrc/custclas.cpp index cb1948ae3d..4c23cfdeb2 100644 --- a/samples/xrc/custclas.cpp +++ b/samples/xrc/custclas.cpp @@ -35,7 +35,7 @@ // that if one of these menu items is clicked, then a certain function is // called. enum { - PU_ADD_RECORD = wxID_HIGHEST + 1, + PU_ADD_RECORD = wxID_HIGHEST, PU_EDIT_RECORD, PU_DELETE_RECORD };