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

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index dadd5f4be7109b11deaef084befcf7a3b6a75166..4423d095f65a4bb3c929e817629f56b167785bc9 100644 (file)
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -76,6 +76,9 @@ public:
 
     virtual bool DeleteAllPages();
 
+    // returns the choice control
+    wxChoice* GetChoiceCtrl() const { return m_choice; }
+
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 

diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index aaa717cee49bb70dc3e4e05bd4923f91b4f23f8b..a2d43c9c574f1630b4ae7063e3c1bcb94dd9052e 100644 (file)
--- a/include/wx/generic/propdlg.h
+++ b/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_

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index f94ec74a3045e92810faa0e4ce9ab8e7756ea76b..ecbaf34ed363c673a7f18dad14d9b17a152d4d65 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -39,13 +39,14 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog)
 
+BEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
+    EVT_ACTIVATE(wxPropertySheetDialog::OnActivate)
+END_EVENT_TABLE()
+
 bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title, 
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
-#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
-    style = wxNO_BORDER;
-#endif    
     if (!wxDialog::Create(parent, id, title, pos, sz, style, name))
         return false;
     
@@ -80,6 +81,10 @@ void wxPropertySheetDialog::LayoutDialog()
     GetSizer()->Fit(this);
     Centre(wxBOTH);
 #endif
+#if defined(__SMARTPHONE__)
+    if (m_bookCtrl)
+        m_bookCtrl->SetFocus();
+#endif
 }
 
 // Creates the buttons, if any
@@ -123,3 +128,21 @@ void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
 #endif
 }
 
+void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
+{
+#if defined(__SMARTPHONE__)
+    // Attempt to focus the choice control: not yet working, but might
+    // be a step in the right direction. OnActivate overrides the default
+    // handler in toplevel.cpp that sets the focus for the first child of
+    // of the dialog (the choicebook).
+    if (event.GetActive())
+    {
+        wxChoicebook* choiceBook = wxDynamicCast(GetBookCtrl(), wxChoicebook);     
+        if (choiceBook)
+            choiceBook->SetFocus();
+    }
+    else
+#endif
+        event.Skip();
+}
+