X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/897b24cf5ca5ca41734c79f7092104921e0c8cae..f1f5f16f780bb41aa2ea24ccbf728f14c86cc475:/src/generic/propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index cc1fbc59c7..15cd495c34 100644
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -13,11 +13,9 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_BOOKCTRL
 
 #ifndef WX_PRECOMP
@@ -29,6 +27,23 @@
 #endif
 
 #include "wx/bookctrl.h"
+
+#if wxUSE_NOTEBOOK
+#include "wx/notebook.h"
+#endif
+#if wxUSE_CHOICEBOOK
+#include "wx/choicebk.h"
+#endif
+#if wxUSE_TOOLBOOK
+#include "wx/toolbook.h"
+#endif
+#if wxUSE_LISTBOOK
+#include "wx/listbook.h"
+#endif
+#if wxUSE_TREEBOOK
+#include "wx/treebook.h"
+#endif
+
 #include "wx/generic/propdlg.h"
 #include "wx/sysopt.h"
 
@@ -40,6 +55,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
     EVT_ACTIVATE(wxPropertySheetDialog::OnActivate)
+    EVT_IDLE(wxPropertySheetDialog::OnIdle)
 END_EVENT_TABLE()
 
 bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title,
@@ -55,11 +71,10 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
-    int extraSpace = 2;
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
-    extraSpace=0;
+    m_sheetOuterBorder = 0;
 #endif
-    topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
+    topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, m_sheetOuterBorder);
 
     m_bookCtrl = CreateBookCtrl();
     AddBookCtrl(m_innerSizer);
@@ -69,17 +84,23 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
 
 void wxPropertySheetDialog::Init()
 {
+    m_sheetStyle = wxPROPSHEET_DEFAULT;
     m_innerSizer = NULL;
     m_bookCtrl = NULL;
+    m_sheetOuterBorder = 2;
+    m_sheetInnerBorder = 5;
 }
 
 // Layout the dialog, to be called after pages have been created
-void wxPropertySheetDialog::LayoutDialog()
+void wxPropertySheetDialog::LayoutDialog(int centreFlags)
 {
 #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
-    Centre(wxBOTH);
+    if (centreFlags)
+        Centre(centreFlags);
+#else
+    wxUnusedVar(centreFlags);
 #endif
 #if defined(__SMARTPHONE__)
     if (m_bookCtrl)
@@ -98,15 +119,11 @@ void wxPropertySheetDialog::CreateButtons(int flags)
 #endif
 
     wxSizer *buttonSizer = CreateButtonSizer( flags & ButtonSizerFlags );
-    if(buttonSizer->GetChildren().GetCount() > 0 )
+    if( buttonSizer )
     {
         m_innerSizer->Add( buttonSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
         m_innerSizer->AddSpacer(2);
     }
-    else
-    {
-        delete buttonSizer;
-    }
 
 #ifdef __POCKETPC__
     // restore system option
@@ -117,13 +134,42 @@ void wxPropertySheetDialog::CreateButtons(int flags)
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
-    int style = wxCLIP_CHILDREN;
-#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
-    style |= wxBK_BOTTOM|wxNB_FLAT;
-#else
-    style |= wxBK_DEFAULT;
+    int style = wxCLIP_CHILDREN | wxBK_DEFAULT;
+
+    wxBookCtrlBase* bookCtrl = NULL;
+
+#if wxUSE_NOTEBOOK
+    if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
+        bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+#endif
+#if wxUSE_CHOICEBOOK
+    if (GetSheetStyle() & wxPROPSHEET_CHOICEBOOK)
+        bookCtrl = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+#endif
+#if wxUSE_TOOLBOOK
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
+    if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)
+        bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxBK_BUTTONBAR );
+    else
 #endif
-    return new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+    if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK))
+        bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+#endif
+#if wxUSE_LISTBOOK
+    if (GetSheetStyle() & wxPROPSHEET_LISTBOOK)
+        bookCtrl = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+#endif
+#if wxUSE_TREEBOOK
+    if (GetSheetStyle() & wxPROPSHEET_TREEBOOK)
+        bookCtrl = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+#endif
+    if (!bookCtrl)
+        bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+
+    if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
+        bookCtrl->SetFitToCurrentPage(true);
+
+    return bookCtrl;
 }
 
 // Adds the book control to the inner sizer.
@@ -135,7 +181,7 @@ void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
     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 );
+    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, m_sheetInnerBorder );
 #endif
 }
 
@@ -157,4 +203,24 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
         event.Skip();
 }
 
+// Resize dialog if necessary
+void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
+{
+    event.Skip();
+
+    if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
+    {
+        int sel = GetBookCtrl()->GetSelection();
+        if (sel != -1 && sel != m_selectedPage)
+        {
+            GetBookCtrl()->InvalidateBestSize();
+            InvalidateBestSize();
+            SetSizeHints(-1, -1, -1, -1);
+
+            m_selectedPage = sel;
+            LayoutDialog(0);
+        }
+    }
+}
+
 #endif // wxUSE_BOOKCTRL