X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc8bc5aa9cd14c158de637acb9e5ed8beb066d57..6493aacaeb7b22b9fa35c559f7753e9fec0da71f:/src/generic/propdlg.cpp?ds=sidebyside

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index d82f8b889c..02c23b3a8e 100644
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -70,11 +70,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 +86,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,6 +98,8 @@ void wxPropertySheetDialog::LayoutDialog(int centreFlags)
     GetSizer()->SetSizeHints(this);
     if (centreFlags)
         Centre(centreFlags);
+#else
+    wxUnusedVar(centreFlags);
 #endif
 #if defined(__SMARTPHONE__)
     if (m_bookCtrl)
@@ -152,7 +155,12 @@ 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|wxBK_BUTTONBAR );
+    else
+#endif
+    if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK))
         bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 #endif
 #if wxUSE_LISTBOOK
@@ -163,7 +171,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
         bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
     
     if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
-        bookCtrl->SetShrinkMode(true);
+        bookCtrl->SetFitToCurrentPage(true);
     
     return bookCtrl;
 }
@@ -177,7 +185,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
 }