Remove defined(__WXMAC__) && defined(__APPLE__) case from the OS if/elif block.

[wxWidgets.git] / include / wx / generic / propdlg.h

diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index 6ff7e487592b750df75a6b52ca48a45ca3f0e9ee..b6c60227d4788e718e1e7bf91af8c58ab5efc892 100644 (file)
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -16,7 +16,9 @@
 
 #if wxUSE_BOOKCTRL
 
-class WXDLLEXPORT wxBookCtrlBase;
+#include "wx/dialog.h"
+
+class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase;
 
 //-----------------------------------------------------------------------------
 // wxPropertySheetDialog
@@ -49,25 +51,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
 {