Added wxID_PAGE_SETUP standard id

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

diff --git a/docs/changes.txt b/docs/changes.txt
index cffa52e58147baa170c1cf90d56d3552074f0a61..8a82d7ded4aa032a29d4952ac86aafe827fcbd9d 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -45,6 +45,14 @@ Major changes in 2.7 release
 - New AUI library supporting docking windows and much more
 
 
+2.7.1
+-----
+
+All (GUI):
+
+- Added wxID_PAGE_SETUP standard id
+
+
 2.7.0
 -----
 

diff --git a/docs/latex/wx/stdevtid.tex b/docs/latex/wx/stdevtid.tex
index bb2c7700e99cfc89e7f9f86a79cddbd003bb6aec..1ec3eba9d18c23d6bca4cac535a1dc73b12af96a 100644 (file)
--- a/docs/latex/wx/stdevtid.tex
+++ b/docs/latex/wx/stdevtid.tex
@@ -36,6 +36,7 @@ own constants in this range.
     wxID_HELP,
     wxID_PRINT,
     wxID_PRINT_SETUP,
+    wxID_PAGE_SETUP,
     wxID_PREVIEW,
     wxID_ABOUT,
     wxID_HELP_CONTENTS,

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 896a20de29319a91e81d00cc4d42c09d8b9a2648..f40be3517494cc4caecc67f0bbc8fd991a1718b3 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1802,6 +1802,7 @@ enum
     wxID_HELP,
     wxID_PRINT,
     wxID_PRINT_SETUP,
+    wxID_PAGE_SETUP,
     wxID_PREVIEW,
     wxID_ABOUT,
     wxID_HELP_CONTENTS,

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 96a7cd6b5a9e9870905565884c46aabea4c5d2a4..20b402dc64453747ebf43519f3255582e3f3c606 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1607,6 +1607,7 @@ static void AddStdXRCID_Records()
     stdID(wxID_HELP);
     stdID(wxID_PRINT);
     stdID(wxID_PRINT_SETUP);
+    stdID(wxID_PAGE_SETUP);
     stdID(wxID_PREVIEW);
     stdID(wxID_ABOUT);
     stdID(wxID_HELP_CONTENTS);