fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index 6ecb9ec47ccb7fe4a397eb918188d9042bc00107..6ff7e487592b750df75a6b52ca48a45ca3f0e9ee 100644 (file)
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -66,6 +66,9 @@ class WXDLLEXPORT wxBookCtrlBase;
 // Shrink dialog to fit current page
 #define wxPROPSHEET_SHRINKTOFIT 0x0100
 
+// Use a wxButtonToolBar toolbook
+#define wxPROPSHEET_BUTTONTOOLBOOK    0x0200
+
 class WXDLLIMPEXP_ADV wxPropertySheetDialog : public wxDialog
 {
 public:
@@ -103,6 +106,14 @@ public:
     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)
@@ -133,6 +144,8 @@ protected:
     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)