Fix install_name_tool calls in OS X "make install".

[wxWidgets.git] / src / generic / propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 80b24e73f84c0dd36da83fd9cb9d8289042e3202..d33530a8311248e6a9fa39ea5d2ccdf8230789ae 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2005-03-12
 // Author:      Julian Smart
 // Modified by:
 // Created:     2005-03-12

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,11 +12,9 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_BOOKCTRL
 
 #ifndef WX_PRECOMP
 #if wxUSE_BOOKCTRL
 
 #ifndef WX_PRECOMP


@@ -42,6 +39,9 @@
 #if wxUSE_LISTBOOK
 #include "wx/listbook.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"
 
 #include "wx/generic/propdlg.h"
 #include "wx/sysopt.h"


@@ -61,6 +61,8 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {

+    parent = GetParentForModalDialog(parent, style);
+

     if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name))
         return false;
 
     if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name))
         return false;
 


@@ -70,11 +72,10 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 

-    int extraSpace = 2;

 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)

-    extraSpace=0;
+    m_sheetOuterBorder = 0;

 #endif
 #endif

-    topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
+    topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, m_sheetOuterBorder);

 
     m_bookCtrl = CreateBookCtrl();
     AddBookCtrl(m_innerSizer);
 
     m_bookCtrl = CreateBookCtrl();
     AddBookCtrl(m_innerSizer);


@@ -87,6 +88,8 @@ void wxPropertySheetDialog::Init()
     m_sheetStyle = wxPROPSHEET_DEFAULT;
     m_innerSizer = NULL;
     m_bookCtrl = NULL;
     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
 }
 
 // Layout the dialog, to be called after pages have been created


@@ -97,11 +100,12 @@ void wxPropertySheetDialog::LayoutDialog(int centreFlags)
     GetSizer()->SetSizeHints(this);
     if (centreFlags)
         Centre(centreFlags);
     GetSizer()->SetSizeHints(this);
     if (centreFlags)
         Centre(centreFlags);

+#else
+    wxUnusedVar(centreFlags);

 #endif
 #if defined(__SMARTPHONE__)
     if (m_bookCtrl)
         m_bookCtrl->SetFocus();
 #endif
 #if defined(__SMARTPHONE__)
     if (m_bookCtrl)
         m_bookCtrl->SetFocus();

-    wxUnusedVar(centreFlags);

 #endif
 }
 
 #endif
 }
 


@@ -115,16 +119,12 @@ void wxPropertySheetDialog::CreateButtons(int flags)
     wxSystemOptions::SetOption(optionName,0);
 #endif
 
     wxSystemOptions::SetOption(optionName,0);
 #endif
 

-    wxSizer *buttonSizer = CreateButtonSizer( flags & ButtonSizerFlags );
-    if(buttonSizer->GetChildren().GetCount() > 0 )
+    wxSizer *buttonSizer = CreateButtonSizer(flags);
+    if( buttonSizer )

     {
         m_innerSizer->Add( buttonSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
         m_innerSizer->AddSpacer(2);
     }
     {
         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
 
 #ifdef __POCKETPC__
     // restore system option


@@ -135,15 +135,10 @@ void wxPropertySheetDialog::CreateButtons(int flags)
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
 // 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;
 
     wxBookCtrlBase* bookCtrl = NULL;

-    
+

 #if wxUSE_NOTEBOOK
     if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
         bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 #if wxUSE_NOTEBOOK
     if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
         bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );


@@ -153,19 +148,28 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
         bookCtrl = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 #endif
 #if wxUSE_TOOLBOOK
         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 );
         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 );
 #endif
     if (!bookCtrl)
         bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );

-    
+

     if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
         bookCtrl->SetFitToCurrentPage(true);
     if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
         bookCtrl->SetFitToCurrentPage(true);

-    
+

     return bookCtrl;
 }
 
     return bookCtrl;
 }
 


@@ -178,7 +182,7 @@ void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
     int borderSize = -2;
     sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize );
 #else
     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
 }
 
 #endif
 }
 


@@ -204,7 +208,7 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
 void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
 {
     event.Skip();
 void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
 {
     event.Skip();

-    
+

     if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
     {
         int sel = GetBookCtrl()->GetSelection();
     if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
     {
         int sel = GetBookCtrl()->GetSelection();


@@ -220,5 +224,10 @@ void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
     }
 }
 
     }
 }
 

-#endif // wxUSE_BOOKCTRL
+// Override function in base
+wxWindow* wxPropertySheetDialog::GetContentWindow() const
+{
+    return GetBookCtrl();
+}

 
 

+#endif // wxUSE_BOOKCTRL