As yet unsuccessful attempt to set the focus to the choice control.

Also removed unnecessary border style setting code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/propdlg.h

@@ -71,8 +71,6 @@ public:
                        long style = wxDEFAULT_DIALOG_STYLE,
                        const wxString& name = wxDialogNameStr);
 
-    void Init();
-
 //// Accessors
 
     // Set and get the notebook
@@ -100,11 +98,18 @@ public:
     // 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)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // _WX_PROPDLG_H_