Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxPROPSHEET_TREEBOOK option

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-06-27 08:01:54 +00:00
parent 58f1fdc926
commit 6334d90353
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/latex/wx/propdlg.tex
View File

@@ -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\_TOOLBOOK}{Uses a toolbook for the controller window.}
\twocolitem{wxPROPSHEET\_CHOICEBOOK}{Uses a choicebook 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\_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 \twocolitem{wxPROPSHEET\_SHRINKTOFIT}{Shrinks the dialog window to fit the currently selected page (common behaviour for
property sheets on Mac OS X).} property sheets on Mac OS X).}
\end{twocollist} \end{twocollist}

21
include/wx/generic/propdlg.h
View File

@@ -49,25 +49,28 @@ class WXDLLEXPORT wxBookCtrlBase;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Use the platform default // Use the platform default
#define wxPROPSHEET_DEFAULT 0x0001 #define wxPROPSHEET_DEFAULT 0x0001
// Use a notebook // Use a notebook
#define wxPROPSHEET_NOTEBOOK 0x0002 #define wxPROPSHEET_NOTEBOOK 0x0002
// Use a toolbook // Use a toolbook
#define wxPROPSHEET_TOOLBOOK 0x0004 #define wxPROPSHEET_TOOLBOOK 0x0004
// Use a choicebook // Use a choicebook
#define wxPROPSHEET_CHOICEBOOK 0x0008 #define wxPROPSHEET_CHOICEBOOK 0x0008
// Use a listbook // Use a listbook
#define wxPROPSHEET_LISTBOOK 0x0010 #define wxPROPSHEET_LISTBOOK 0x0010
// Shrink dialog to fit current page
#define wxPROPSHEET_SHRINKTOFIT 0x0100
// Use a wxButtonToolBar toolbook // 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 class WXDLLIMPEXP_ADV wxPropertySheetDialog : public wxDialog
{ {

7
src/generic/propdlg.cpp
View File

@@ -40,6 +40,9 @@
#if wxUSE_LISTBOOK #if wxUSE_LISTBOOK
#include "wx/listbook.h" #include "wx/listbook.h"
#endif #endif
#if wxUSE_TREEBOOK
#include "wx/treebook.h"
#endif
#include "wx/generic/propdlg.h" #include "wx/generic/propdlg.h"
#include "wx/sysopt.h" #include "wx/sysopt.h"
@@ -159,6 +162,10 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
#if wxUSE_LISTBOOK #if wxUSE_LISTBOOK
if (GetSheetStyle() & wxPROPSHEET_LISTBOOK) if (GetSheetStyle() & wxPROPSHEET_LISTBOOK)
bookCtrl = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); 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 #endif
if (!bookCtrl) if (!bookCtrl)
bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );