X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0906c58d0533380cd706b4de2a88615f0f187995..2b199a38dccae76ad59f747dd7ef6fcfc680c089:/src/generic/propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index f94ec74a30..abfc87723d 100644
--- 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;
     
@@ -55,7 +56,7 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
-    int extraSpace = 5;
+    int extraSpace = 2;
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     extraSpace=0;
 #endif
@@ -78,8 +79,13 @@ void wxPropertySheetDialog::LayoutDialog()
 {
 #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
     GetSizer()->Fit(this);
+    GetSizer()->SetSizeHints(this);
     Centre(wxBOTH);
 #endif
+#if defined(__SMARTPHONE__)
+    if (m_bookCtrl)
+        m_bookCtrl->SetFocus();
+#endif
 }
 
 // Creates the buttons, if any
@@ -90,11 +96,14 @@ void wxPropertySheetDialog::CreateButtons(int flags)
     // Perhaps that could be embedded in CreateButtonSizer() directly.
     SetRightMenu(wxID_CANCEL);
     SetLeftMenu(wxID_OK);
+    wxUnusedVar(flags);
 #elif defined(__POCKETPC__)
     // Do nothing
+    wxUnusedVar(flags);
 #else
     wxSizer* sizer = CreateButtonSizer(flags);
-    m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
+    m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
+    m_innerSizer->AddSpacer(2);
 #endif
 }
 
@@ -123,3 +132,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();
+}
+