X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53bc349182ac952e5ef8131b0e570fd342b7273d..9ca5a18a01a7d87870427cb0fc1962db2f11a45d:/src/generic/propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 16de4b7479..604e6f8155 100644
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -39,6 +39,10 @@
 
 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)
@@ -52,8 +56,8 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
-    int extraSpace = 5;
-#ifdef __WXWINCE__
+    int extraSpace = 2;
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     extraSpace=0;
 #endif
     topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
@@ -73,24 +77,31 @@ void wxPropertySheetDialog::Init()
 // Layout the dialog, to be called after pages have been created
 void wxPropertySheetDialog::LayoutDialog()
 {
-#ifndef __WXWINCE__
+#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
 void wxPropertySheetDialog::CreateButtons(int flags)
 {
 #if defined(__SMARTPHONE__)
-    // TODO: if flags turns more buttons then make right menu from ID
-    // to real menu with all the other IDs available. Perhaps that could be
-    // embedded in CreateButtonSizer() directly.
+    // TODO: create a right-click menu with all the other IDs available.
+    // Perhaps that could be embedded in CreateButtonSizer() directly.
     SetRightMenu(wxID_CANCEL);
     SetLeftMenu(wxID_OK);
-#elif !defined(__WXWINCE__)
+#elif defined(__POCKETPC__)
+    // Do nothing
+#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
 }
 
@@ -112,9 +123,28 @@ void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
 #if defined(__POCKETPC__) && wxUSE_NOTEBOOK
     // The book control has to be sized larger than the dialog because of a border bug
     // in WinCE
-    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, -3 );
+    int borderSize = -2;
+    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize );
 #else
     sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 #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();
+}
+