don't use -single_module together with -bundle under Darwin (ld gives an error for...

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

diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index aaa717cee49bb70dc3e4e05bd4923f91b4f23f8b..8d168f32d5284d6e020e5ff41bdda1d425882f1b 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;
 


@@ -71,8 +71,6 @@ public:
                        long style = wxDEFAULT_DIALOG_STYLE,
                        const wxString& name = wxDialogNameStr);
 
                        long style = wxDEFAULT_DIALOG_STYLE,
                        const wxString& name = wxDialogNameStr);
 

-    void Init();
-

 //// Accessors
 
     // Set and get the notebook
 //// Accessors
 
     // Set and get the notebook


@@ -100,12 +98,21 @@ public:
     // Adds the book control to the inner sizer.
     virtual void AddBookCtrl(wxSizer* sizer);
 
     // Adds the book control to the inner sizer.
     virtual void AddBookCtrl(wxSizer* sizer);
 

+    // Set the focus
+    void OnActivate(wxActivateEvent& event);
+
+private:
+    void Init();
+

 protected:
     wxBookCtrlBase* m_bookCtrl;
     wxSizer*        m_innerSizer; // sizer for extra space
 
     DECLARE_DYNAMIC_CLASS(wxPropertySheetDialog)
 protected:
     wxBookCtrlBase* m_bookCtrl;
     wxSizer*        m_innerSizer; // sizer for extra space
 
     DECLARE_DYNAMIC_CLASS(wxPropertySheetDialog)

+    DECLARE_EVENT_TABLE()

 };
 
 };
 

+#endif // wxUSE_BOOKCTRL
+

 #endif // _WX_PROPDLG_H_
 
 #endif // _WX_PROPDLG_H_