X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a02f7807ce4899bcd5b112b050ba2f8917f21805..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/generic/propdlg.h?ds=sidebyside diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h index 282a25072b..b196ea34dc 100644 --- a/include/wx/generic/propdlg.h +++ b/include/wx/generic/propdlg.h @@ -16,7 +16,9 @@ #if wxUSE_BOOKCTRL -#include "wx/bookctrl.h" +#include "wx/dialog.h" + +class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase; //----------------------------------------------------------------------------- // wxPropertySheetDialog @@ -48,29 +50,32 @@ // kind of book control. //----------------------------------------------------------------------------- -// Use the platform default -#define wxPROPSHEET_DEFAULT 0x0001 +enum wxPropertySheetDialogFlags +{ + // Use the platform default + wxPROPSHEET_DEFAULT = 0x0001, -// Use a notebook -#define wxPROPSHEET_NOTEBOOK 0x0002 + // Use a notebook + wxPROPSHEET_NOTEBOOK = 0x0002, -// Use a toolbook -#define wxPROPSHEET_TOOLBOOK 0x0004 + // Use a toolbook + wxPROPSHEET_TOOLBOOK = 0x0004, -// Use a choicebook -#define wxPROPSHEET_CHOICEBOOK 0x0008 + // Use a choicebook + wxPROPSHEET_CHOICEBOOK = 0x0008, -// Use a listbook -#define wxPROPSHEET_LISTBOOK 0x0010 + // Use a listbook + wxPROPSHEET_LISTBOOK = 0x0010, -// Use a wxButtonToolBar toolbook -#define wxPROPSHEET_BUTTONTOOLBOOK 0x0020 + // Use a wxButtonToolBar toolbook + wxPROPSHEET_BUTTONTOOLBOOK = 0x0020, -// Use a treebook -#define wxPROPSHEET_TREEBOOK 0x0040 + // Use a treebook + wxPROPSHEET_TREEBOOK = 0x0040, -// Shrink dialog to fit current page -#define wxPROPSHEET_SHRINKTOFIT 0x0100 + // Shrink dialog to fit current page + wxPROPSHEET_SHRINKTOFIT = 0x0100 +}; class WXDLLIMPEXP_ADV wxPropertySheetDialog : public wxDialog { @@ -101,6 +106,9 @@ public: void SetBookCtrl(wxBookCtrlBase* book) { m_bookCtrl = book; } wxBookCtrlBase* GetBookCtrl() const { return m_bookCtrl; } + // Override function in base + virtual wxWindow* GetContentWindow() const; + // Set and get the inner sizer void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; } wxSizer* GetInnerSizer() const { return m_innerSizer ; }