Added wxPROPSHEET_TREEBOOK option

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

diff --git a/docs/latex/wx/propdlg.tex b/docs/latex/wx/propdlg.tex
index 83b9f421f3eaeb63333f678ef8578595124f4a2d..4682ed89b43d19b5fc04d41b5e6cd675a4eea8ec 100644 (file)
--- a/docs/latex/wx/propdlg.tex
+++ b/docs/latex/wx/propdlg.tex
@@ -147,6 +147,7 @@ normally a notebook except on Smartphone where a choice control is used.}
 \twocolitem{wxPROPSHEET\_TOOLBOOK}{Uses a toolbook for the controller window.}
 \twocolitem{wxPROPSHEET\_CHOICEBOOK}{Uses a choicebook for the controller window.}
 \twocolitem{wxPROPSHEET\_LISTBOOK}{Uses a listbook for the controller window.}
+\twocolitem{wxPROPSHEET\_TREEBOOK}{Uses a treebook for the controller window.}
 \twocolitem{wxPROPSHEET\_SHRINKTOFIT}{Shrinks the dialog window to fit the currently selected page (common behaviour for
 property sheets on Mac OS X).}
 \end{twocollist}

diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index 6ff7e487592b750df75a6b52ca48a45ca3f0e9ee..f2fcbaf9c96df5ca3408a4e6bd1a3c313bf2d041 100644 (file)
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -49,25 +49,28 @@ class WXDLLEXPORT wxBookCtrlBase;
 //-----------------------------------------------------------------------------
 
 // Use the platform default
-#define wxPROPSHEET_DEFAULT     0x0001
+#define wxPROPSHEET_DEFAULT         0x0001
 
 // Use a notebook
-#define wxPROPSHEET_NOTEBOOK    0x0002
+#define wxPROPSHEET_NOTEBOOK        0x0002
 
 // Use a toolbook
-#define wxPROPSHEET_TOOLBOOK    0x0004
+#define wxPROPSHEET_TOOLBOOK        0x0004
 
 // Use a choicebook
-#define wxPROPSHEET_CHOICEBOOK  0x0008
+#define wxPROPSHEET_CHOICEBOOK      0x0008
 
 // Use a listbook
-#define wxPROPSHEET_LISTBOOK    0x0010
-
-// Shrink dialog to fit current page
-#define wxPROPSHEET_SHRINKTOFIT 0x0100
+#define wxPROPSHEET_LISTBOOK        0x0010
 
 // Use a wxButtonToolBar toolbook
-#define wxPROPSHEET_BUTTONTOOLBOOK    0x0200
+#define wxPROPSHEET_BUTTONTOOLBOOK  0x0020
+
+// Use a treebook
+#define wxPROPSHEET_TREEBOOK        0x0040
+
+// Shrink dialog to fit current page
+#define wxPROPSHEET_SHRINKTOFIT     0x0100
 
 class WXDLLIMPEXP_ADV wxPropertySheetDialog : public wxDialog
 {

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 12dae96c8256a446de1315df854eb95cfe9fbada..d463f21ead355915583f3fba3bd680acedf5d25a 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -40,6 +40,9 @@
 #if wxUSE_LISTBOOK
 #include "wx/listbook.h"
 #endif
+#if wxUSE_TREEBOOK
+#include "wx/treebook.h"
+#endif
 
 #include "wx/generic/propdlg.h"
 #include "wx/sysopt.h"
@@ -159,6 +162,10 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 #if wxUSE_LISTBOOK
     if (GetSheetStyle() & wxPROPSHEET_LISTBOOK)
         bookCtrl = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+#endif
+#if wxUSE_TREEBOOK
+    if (GetSheetStyle() & wxPROPSHEET_TREEBOOK)
+        bookCtrl = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 #endif
     if (!bookCtrl)
         bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );