Fixed various NULL reference issues. Also cleaned up wxPGComboBox code overall a...

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

diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index b6c60227d4788e718e1e7bf91af8c58ab5efc892..4d5206f051b15d2e2acf17238847af94af0c312b 100644 (file)
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -50,29 +50,32 @@ class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase;
 // kind of book control.
 //-----------------------------------------------------------------------------
 
-// Use the platform default
-#define wxPROPSHEET_DEFAULT         0x0001
+enum wxPropertySheetDialogFlags
+{
+    // Use the platform default
+    wxPROPSHEET_DEFAULT = 0x0001,
 
-// Use a notebook
-#define wxPROPSHEET_NOTEBOOK        0x0002
+    // Use a notebook
+    wxPROPSHEET_NOTEBOOK = 0x0002,
 
-// Use a toolbook
-#define wxPROPSHEET_TOOLBOOK        0x0004
+    // Use a toolbook
+    wxPROPSHEET_TOOLBOOK = 0x0004,
 
-// Use a choicebook
-#define wxPROPSHEET_CHOICEBOOK      0x0008
+    // Use a choicebook
+    wxPROPSHEET_CHOICEBOOK = 0x0008,
 
-// Use a listbook
-#define wxPROPSHEET_LISTBOOK        0x0010
+    // Use a listbook
+    wxPROPSHEET_LISTBOOK = 0x0010,
 
-// Use a wxButtonToolBar toolbook
-#define wxPROPSHEET_BUTTONTOOLBOOK  0x0020
+    // Use a wxButtonToolBar toolbook
+    wxPROPSHEET_BUTTONTOOLBOOK = 0x0020,
 
-// Use a treebook
-#define wxPROPSHEET_TREEBOOK        0x0040
+    // Use a treebook
+    wxPROPSHEET_TREEBOOK = 0x0040,
 
-// Shrink dialog to fit current page
-#define wxPROPSHEET_SHRINKTOFIT     0x0100
+    // Shrink dialog to fit current page
+    wxPROPSHEET_SHRINKTOFIT = 0x0100,
+};
 
 class WXDLLIMPEXP_ADV wxPropertySheetDialog : public wxDialog
 {
@@ -103,6 +106,9 @@ public:
     void SetBookCtrl(wxBookCtrlBase* book) { m_bookCtrl = book; }
     wxBookCtrlBase* GetBookCtrl() const { return m_bookCtrl; }
 
+    // Override function in base
+    virtual wxWindow* GetContentWindow() const;
+
     // Set and get the inner sizer
     void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; }
     wxSizer* GetInnerSizer() const { return m_innerSizer ; }