corrected WX_DEFINE_VARARG_FUNC_NOP usage

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

diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index 5be620facae104323bb6a6ed2c6223d0b524d317..a7fbf3d9e95565761be2488d532d3edd91388502 100644 (file)
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -16,7 +16,9 @@
 
 #if wxUSE_BOOKCTRL
 
 
 #if wxUSE_BOOKCTRL
 

-class WXDLLEXPORT wxBookCtrlBase;
+#include "wx/dialog.h"
+
+class WXDLLIMPEXP_CORE wxBookCtrlBase;

 
 //-----------------------------------------------------------------------------
 // wxPropertySheetDialog
 
 //-----------------------------------------------------------------------------
 // wxPropertySheetDialog


@@ -49,25 +51,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
-
-// Shrink dialog to fit current page
-#define wxPROPSHEET_SHRINKTOFIT 0x0100
+#define wxPROPSHEET_LISTBOOK        0x0010

 
 // 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
 {


@@ -106,6 +111,14 @@ public:
     void SetSheetStyle(long sheetStyle) { m_sheetStyle = sheetStyle; }
     long GetSheetStyle() const { return m_sheetStyle ; }
 
     void SetSheetStyle(long sheetStyle) { m_sheetStyle = sheetStyle; }
     long GetSheetStyle() const { return m_sheetStyle ; }
 

+    // Set and get the border around the whole dialog
+    void SetSheetOuterBorder(int border) { m_sheetOuterBorder = border; }
+    int GetSheetOuterBorder() const { return m_sheetOuterBorder ; }
+
+    // Set and get the border around the book control only
+    void SetSheetInnerBorder(int border) { m_sheetInnerBorder = border; }
+    int GetSheetInnerBorder() const { return m_sheetInnerBorder ; }
+

 /// Operations
 
     // Creates the buttons (none on PocketPC)
 /// Operations
 
     // Creates the buttons (none on PocketPC)


@@ -136,6 +149,8 @@ protected:
     wxBookCtrlBase* m_bookCtrl;
     wxSizer*        m_innerSizer; // sizer for extra space
     long            m_sheetStyle;
     wxBookCtrlBase* m_bookCtrl;
     wxSizer*        m_innerSizer; // sizer for extra space
     long            m_sheetStyle;

+    int             m_sheetOuterBorder;
+    int             m_sheetInnerBorder;

     int             m_selectedPage;
 
     DECLARE_DYNAMIC_CLASS(wxPropertySheetDialog)
     int             m_selectedPage;
 
     DECLARE_DYNAMIC_CLASS(wxPropertySheetDialog)