Use standard ids

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index bee92ff91b6839e10bea885126886f92c3a00fff..0cd2b4f593f4d0ce4d407446f2f3bdef9efbc208 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -368,9 +368,9 @@ IMPLEMENT_APP(MyApp)
 
 enum
 {
-    CONTROLS_QUIT   = 100,
-    CONTROLS_TEXT,
-    CONTROLS_ABOUT,
+    CONTROLS_QUIT   = wxID_EXIT,
+    CONTROLS_ABOUT = wxID_ABOUT,
+    CONTROLS_TEXT = 100,
     CONTROLS_CLEAR_LOG,
 
     // tooltip menu

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index bdb9c310a3c7d1653d594ae542271bf4041d3b6d..72d0e5b7e4c8c69be2dc940ec368dd4467451df6 100644 (file)
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -26,9 +26,9 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 #if wxUSE_GRID
 #define FILE_DBGRID_TABLE     130
 #endif
-#define FILE_EXIT             199
+#define FILE_EXIT             wxID_EXIT
 #define EDIT_PARAMETERS       200
-#define HELP_ABOUT            300
+#define HELP_ABOUT            wxID_ABOUT
 
 // this seems to be missing, Robert Roebling (?)
 #ifndef MAX_PATH

diff --git a/samples/docview/docview.h b/samples/docview/docview.h
index 08289db1bc4c78c09ccf336b0a939239de00820f..7b93ae186f3e5e9e3b2e6b9c8069511b81da1129 100644 (file)
--- a/samples/docview/docview.h
+++ b/samples/docview/docview.h
@@ -59,7 +59,7 @@ public:
 extern MyFrame *GetMainFrame(void);
 
 #define DOCVIEW_CUT     1
-#define DOCVIEW_ABOUT   2
+#define DOCVIEW_ABOUT   wxID_ABOUT
 
 extern bool singleWindowMode;
 

diff --git a/samples/docvwmdi/docview.h b/samples/docvwmdi/docview.h
index ce603abd7256fa72c9d47bfea338d1606760084e..96eaeb90b8f200a6542a05cacd3fc90cf778dd8a 100644 (file)
--- a/samples/docvwmdi/docview.h
+++ b/samples/docvwmdi/docview.h
@@ -58,7 +58,7 @@ DECLARE_EVENT_TABLE()
 extern MyFrame *GetMainFrame(void);
 
 #define DOCVIEW_CUT     1
-#define DOCVIEW_ABOUT   2
+#define DOCVIEW_ABOUT   wxID_ABOUT
 
 extern bool singleWindowMode;
 

diff --git a/samples/dynamic/dynamic.cpp b/samples/dynamic/dynamic.cpp
index 6e803e0eba5acdeba10cb5844280a535b5da2409..f94ca57e44fcd3cd36c5b40ffaac510fa5a79cfd 100644 (file)
--- a/samples/dynamic/dynamic.cpp
+++ b/samples/dynamic/dynamic.cpp
@@ -46,9 +46,9 @@ class MyFrame: public wxFrame
 };
 
 // ID for the menu commands
-#define DYNAMIC_QUIT   1
+#define DYNAMIC_QUIT   wxID_EXIT
 #define DYNAMIC_TEXT   101
-#define DYNAMIC_ABOUT   102
+#define DYNAMIC_ABOUT  wxID_ABOUT
 
 // Create a new application object
 IMPLEMENT_APP  (MyApp)

diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index af1a576dae0af3269cd903c78676d3f2f44bb9cd..772583b1007c7f6f6a69bc910cf1e75438572cc4 100644 (file)
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -99,7 +99,7 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame )
     EVT_MENU( ID_SET_CELL_FG_COLOUR, GridFrame::SetCellFgColour )
     EVT_MENU( ID_SET_CELL_BG_COLOUR, GridFrame::SetCellBgColour )
 
-    EVT_MENU( ID_ABOUT, GridFrame::About )
+    EVT_MENU( wxID_ABOUT, GridFrame::About )
     EVT_MENU( wxID_EXIT, GridFrame::OnQuit )
     EVT_MENU( ID_VTABLE, GridFrame::OnVTable)
     EVT_MENU( ID_BUGS_TABLE, GridFrame::OnBugsTable)
@@ -215,7 +215,7 @@ GridFrame::GridFrame()
 
 
     wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append( ID_ABOUT, _T("&About wxGrid demo") );
+    helpMenu->Append( wxID_ABOUT, _T("&About wxGrid demo") );
 
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append( fileMenu, _T("&File") );

diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index ec95d19e1dde1effe7f41eff0fba9a80a857ca49..f2ff5c4af0b64f33b651e01aa7dffc0f17ffd4a0 100644 (file)
--- a/samples/grid/griddemo.h
+++ b/samples/grid/griddemo.h
@@ -133,7 +133,6 @@ public:
         ID_SELCOLS,
         ID_SET_CELL_FG_COLOUR,
         ID_SET_CELL_BG_COLOUR,
-        ID_ABOUT,
         ID_VTABLE,
         ID_BUGS_TABLE,
         ID_SMALL_GRID,

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index ee7ad0de60c7761bac2a347a26675ce2e2d91664..a0f10192d22a0523f89f5ebc33b596da2a4f855e 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -898,10 +898,10 @@ void MyCanvas::CreateAntiAliasedBitmap()
 
 enum
 {
-    ID_QUIT  = 108,
-    ID_ABOUT,
-    ID_NEW,
-    ID_SHOWRAW
+    ID_QUIT  = wxID_EXIT,
+    ID_ABOUT = wxID_ABOUT,
+    ID_NEW = 100,
+    ID_SHOWRAW = 101
 };
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 9b91dbd74e933b3be79010ee9ac3532a82db306d..fd95dc0ab4fb7196a50d081de520df98dc5e86a3 100644 (file)
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -84,10 +84,10 @@ private:
 // controls and menu constants
 enum
 {
-    LAYOUT_QUIT = 100,
-    LAYOUT_ABOUT,
-    LAYOUT_TEST_SIZER,
-    LAYOUT_TEST_NB_SIZER,
-    LAYOUT_TEST_GB_SIZER
+    LAYOUT_QUIT = wxID_EXIT,
+    LAYOUT_ABOUT = wxID_ABOUT,
+    LAYOUT_TEST_SIZER = 101,
+    LAYOUT_TEST_NB_SIZER = 102,
+    LAYOUT_TEST_GB_SIZE = 103
 };
 

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index 796f40bbd0740d7f76c28f25b3329cf5e764e1c3..d0d6c422e17c87d6cf3c36791de3ee26eb21013d 100644 (file)
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -79,12 +79,12 @@ public:
 // menu items ids
 enum
 {
-    MDI_QUIT = 100,
-    MDI_NEW_WINDOW,
+    MDI_QUIT = wxID_EXIT,
+    MDI_NEW_WINDOW = 101,
     MDI_REFRESH,
     MDI_CHANGE_TITLE,
     MDI_CHANGE_POSITION,
     MDI_CHANGE_SIZE,
     MDI_CHILD_QUIT,
-    MDI_ABOUT
+    MDI_ABOUT = wxID_ABOUT
 };

diff --git a/samples/sashtest/sashtest.h b/samples/sashtest/sashtest.h
index 11c644f8a98d3e8529087db39e9885680873ea15..c67bb0c1a68434a0067aff119e7807cb91a58a2a 100644 (file)
--- a/samples/sashtest/sashtest.h
+++ b/samples/sashtest/sashtest.h
@@ -63,11 +63,11 @@ class MyChild: public wxMDIChildFrame
 DECLARE_EVENT_TABLE()
 };
 
-#define SASHTEST_QUIT        1
+#define SASHTEST_QUIT        wxID_EXIT
 #define SASHTEST_NEW_WINDOW  2
 #define SASHTEST_REFRESH     3
 #define SASHTEST_CHILD_QUIT  4
-#define SASHTEST_ABOUT       5
+#define SASHTEST_ABOUT       wxID_ABOUT
 #define SASHTEST_TOGGLE_WINDOW 6
 
 #define ID_WINDOW_TOP       100

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 90f11e1c79804f948f1c84a24c7c6c42229c1906..bf5327cd11d394b7784c5a0cbe33cf9158170d57 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -475,10 +475,10 @@ void MyAutoScrollWindow::OnResizeClick( wxCommandEvent &WXUNUSED( event ) )
 // MyFrame
 // ----------------------------------------------------------------------------
 
-const long ID_QUIT       = wxNewId();
-const long ID_ABOUT      = wxNewId();
-const long ID_DELETE_ALL = wxNewId();
-const long ID_INSERT_NEW = wxNewId();
+const long ID_QUIT       = wxID_EXIT;
+const long ID_ABOUT      = wxID_ABOUT;
+const long ID_DELETE_ALL = 100;
+const long ID_INSERT_NEW = 101;
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 

diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp
index 71e4ba8b016fa60a7db9221a22ab6f7d8d679413..f8620259de4b998b205c2bd29df636b5ff4c58ca 100644 (file)
--- a/samples/scrollsub/scrollsub.cpp
+++ b/samples/scrollsub/scrollsub.cpp
@@ -374,9 +374,9 @@ void MyCanvas::ScrollWindow( int dx, int dy, const wxRect *rect )
 
 // MyFrame
 
-const int ID_QUIT  = 108;
+const int ID_QUIT  = wxID_EXIT;
 const int ID_FULL  = 109;
-const int ID_ABOUT = 110;
+const int ID_ABOUT = wxID_ABOUT;
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 7e47be6c1788d0b784092a338b066a8b1644d6b2..6acab6716f35bd16ace06c98ff63a2a60dd54104 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -112,9 +112,9 @@ private:
 enum
 {
   // menu items
-  CLIENT_QUIT = 1000,
-  CLIENT_ABOUT,
-  CLIENT_OPEN,
+  CLIENT_QUIT = wxID_EXIT,
+  CLIENT_ABOUT = wxID_ABOUT,
+  CLIENT_OPEN = 100,
   CLIENT_TEST1,
   CLIENT_TEST2,
   CLIENT_TEST3,

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index fab500e48d92043d97b10dac98550b76325810d8..548ad955b699eec263e9a1831734d5534f8e2f35 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -96,11 +96,11 @@ private:
 enum
 {
   // menu items
-  SERVER_QUIT = 1000,
-  SERVER_ABOUT,
+  SERVER_QUIT = wxID_EXIT,
+  SERVER_ABOUT = wxID_ABOUT,
 
   // id for sockets
-  SERVER_ID,
+  SERVER_ID = 100,
   SOCKET_ID
 };
 

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 9229c801ec6f8adbbaecdf40a7b10341aea797db..cb7961eeead6736b191987086640b024f4dcfe4b 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -328,9 +328,9 @@ IMPLEMENT_APP(MyApp)
 
 enum
 {
-    TEXT_QUIT = 100,
-    TEXT_ABOUT,
-    TEXT_LOAD,
+    TEXT_QUIT = wxID_EXIT,
+    TEXT_ABOUT = wxID_ABOUT,
+    TEXT_LOAD = 101,
     TEXT_SAVE,
     TEXT_CLEAR,
     TEXT_RICH_TEXT_TEST,

diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 64a0f91bc475a93ac58e9cb203361cf0187c6811..248b3dee4437816a5a5435d7bcbd6571169f07bb 100644 (file)
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -134,7 +134,8 @@ private:
 // ID for the menu commands
 enum
 {
-    THREAD_QUIT          = 1,
+    THREAD_QUIT  = wxID_EXIT,
+    THREAD_ABOUT = wxID_ABOUT,
     THREAD_TEXT          = 101,
     THREAD_CLEAR,
     THREAD_START_THREAD  = 201,
@@ -148,7 +149,6 @@ enum
     THREAD_EXEC_THREAD,
 
     THREAD_SHOWCPUS,
-    THREAD_ABOUT,
 
     WORKER_EVENT    // this one gets sent from the worker thread
 };

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index f5bab25a777695c1185b66692f1c4ab97fcc0880..5abcc3a78449fccf763ee3c93a2f4979aa22e06e 100644 (file)
--- a/samples/typetest/typetest.h
+++ b/samples/typetest/typetest.h
@@ -70,9 +70,9 @@ enum
 {
     TYPES_QUIT = wxID_EXIT,
     TYPES_TEXT = 101,
-    TYPES_ABOUT,
+    TYPES_ABOUT = wxID_ABOUT,
 
-    TYPES_DATE,
+    TYPES_DATE = 102,
     TYPES_TIME,
     TYPES_VARIANT,
     TYPES_BYTEORDER,

diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index e838e00063b06f592b1ac664fe1fb95c4579e674..cddf8b9c6b9f1db13de04ba015e93aeed43d06c3 100644 (file)
--- a/samples/vscroll/vstest.cpp
+++ b/samples/vscroll/vstest.cpp
@@ -174,7 +174,7 @@ END_EVENT_TABLE()
 enum
 {
     // menu items
-    VScroll_Quit = 1,
+    VScroll_Quit = wxID_EXIT,
 
     // it is important for the id corresponding to the "About" command to have
     // this standard value as otherwise it won't be handled properly under Mac