The Great wxRegion Refactoring:

[wxWidgets.git] / src / generic / propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 02c23b3a8edd3f40c95fc45c68419f6b1c7d277a..d463f21ead355915583f3fba3bd680acedf5d25a 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -13,11 +13,9 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_BOOKCTRL
 
 #ifndef WX_PRECOMP
@@ -42,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"
@@ -137,15 +138,10 @@ void wxPropertySheetDialog::CreateButtons(int flags)
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
-    int style = wxCLIP_CHILDREN;
-#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
-    style |= wxBK_BOTTOM|wxNB_FLAT;
-#else
-    style |= wxBK_DEFAULT;
-#endif
+    int style = wxCLIP_CHILDREN | wxBK_DEFAULT;
 
     wxBookCtrlBase* bookCtrl = NULL;
-    
+
 #if wxUSE_NOTEBOOK
     if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
         bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
@@ -166,13 +162,17 @@ 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 );
-    
+
     if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
         bookCtrl->SetFitToCurrentPage(true);
-    
+
     return bookCtrl;
 }
 
@@ -211,7 +211,7 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
 void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
 {
     event.Skip();
-    
+
     if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
     {
         int sel = GetBookCtrl()->GetSelection();
@@ -228,4 +228,3 @@ void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
 }
 
 #endif // wxUSE_BOOKCTRL
-