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 a2d43c9c574f1630b4ae7063e3c1bcb94dd9052e..6ff7e487592b750df75a6b52ca48a45ca3f0e9ee 100644 (file)
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -12,9 +12,9 @@
 #ifndef _WX_PROPDLG_H_
 #define _WX_PROPDLG_H_
 
 #ifndef _WX_PROPDLG_H_
 #define _WX_PROPDLG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "propdlg.h"
-#endif
+#include "wx/defs.h"
+
+#if wxUSE_BOOKCTRL

 
 class WXDLLEXPORT wxBookCtrlBase;
 
 
 class WXDLLEXPORT wxBookCtrlBase;
 


@@ -48,6 +48,27 @@ class WXDLLEXPORT wxBookCtrlBase;
 // kind of book control.
 //-----------------------------------------------------------------------------
 
 // kind of book control.
 //-----------------------------------------------------------------------------
 

+// Use the platform default
+#define wxPROPSHEET_DEFAULT     0x0001
+
+// Use a notebook
+#define wxPROPSHEET_NOTEBOOK    0x0002
+
+// Use a toolbook
+#define wxPROPSHEET_TOOLBOOK    0x0004
+
+// Use a choicebook
+#define wxPROPSHEET_CHOICEBOOK  0x0008
+
+// Use a listbook
+#define wxPROPSHEET_LISTBOOK    0x0010
+
+// 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:
 class WXDLLIMPEXP_ADV wxPropertySheetDialog : public wxDialog
 {
 public:


@@ -81,13 +102,25 @@ public:
     void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; }
     wxSizer* GetInnerSizer() const { return m_innerSizer ; }
 
     void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; }
     wxSizer* GetInnerSizer() const { return m_innerSizer ; }
 

+    // Set and get the book style
+    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)
     virtual void CreateButtons(int flags = wxOK|wxCANCEL);
 
     // Lay out the dialog, to be called after pages have been created
 /// Operations
 
     // Creates the buttons (none on PocketPC)
     virtual void CreateButtons(int flags = wxOK|wxCANCEL);
 
     // Lay out the dialog, to be called after pages have been created

-    virtual void LayoutDialog();
+    virtual void LayoutDialog(int centreFlags = wxBOTH);

 
 /// Implementation
 
 
 /// Implementation
 


@@ -101,16 +134,25 @@ public:
     // Set the focus
     void OnActivate(wxActivateEvent& event);
 
     // Set the focus
     void OnActivate(wxActivateEvent& event);
 

+    // Resize dialog if necessary
+    void OnIdle(wxIdleEvent& event);
+

 private:
     void Init();
 
 protected:
     wxBookCtrlBase* m_bookCtrl;
     wxSizer*        m_innerSizer; // sizer for extra space
 private:
     void Init();
 
 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)
     DECLARE_EVENT_TABLE()
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxPropertySheetDialog)
     DECLARE_EVENT_TABLE()
 };
 

+#endif // wxUSE_BOOKCTRL
+

 #endif // _WX_PROPDLG_H_
 
 #endif // _WX_PROPDLG_H_