X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6fc07dd8c0af97c1b2b421dba93447333d935747..ef11ea71bb3d1213bb3355a5674fdec3d8d41514:/src/generic/propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 5de4cacead..b61825d1f2 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
@@ -42,6 +40,9 @@
 #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"
@@ -61,6 +62,8 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
+    parent = GetParentForModalDialog(parent);
+
     if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name))
         return false;
 
@@ -70,11 +73,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);
@@ -87,6 +89,8 @@ 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
@@ -97,11 +101,12 @@ void wxPropertySheetDialog::LayoutDialog(int centreFlags)
     GetSizer()->SetSizeHints(this);
     if (centreFlags)
         Centre(centreFlags);
+#else
+    wxUnusedVar(centreFlags);
 #endif
 #if defined(__SMARTPHONE__)
     if (m_bookCtrl)
         m_bookCtrl->SetFocus();
-    wxUnusedVar(centreFlags);
 #endif
 }
 
@@ -116,15 +121,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
@@ -135,15 +136,10 @@ 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;
-#endif
+    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 );
@@ -153,19 +149,28 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
         bookCtrl = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 #endif
 #if wxUSE_TOOLBOOK
-    if (GetSheetStyle() & wxPROPSHEET_TOOLBOOK)
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
+    if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)
+        bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxTBK_BUTTONBAR );
+    else
+#endif
+    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->SetShrinkMode(true);
-    
+        bookCtrl->SetFitToCurrentPage(true);
+
     return bookCtrl;
 }
 
@@ -178,7 +183,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
 }
 
@@ -204,7 +209,7 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
 void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
 {
     event.Skip();
-    
+
     if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
     {
         int sel = GetBookCtrl()->GetSelection();
@@ -220,5 +225,10 @@ void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
     }
 }
 
-#endif // wxUSE_BOOKCTRL
+// Override function in base
+wxWindow* wxPropertySheetDialog::GetContentWindow() const
+{
+    return GetBookCtrl();
+}
 
+#endif // wxUSE_BOOKCTRL