Document wxDateTime::GregorianAdoption enum and TimeZone class.

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

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 02c23b3a8edd3f40c95fc45c68419f6b1c7d277a..20b01263c927916ec7919b8c06ca1ef3edf2ef0e 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -13,11 +13,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 +40,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 +62,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;
 


@@ -117,16 +120,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


@@ -137,15 +136,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 );


@@ -157,7 +151,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 #if wxUSE_TOOLBOOK
 #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
     if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)
 #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 );
+        bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxTBK_BUTTONBAR );

     else
 #endif
     if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK))
     else
 #endif
     if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK))


@@ -166,13 +160,17 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 #if wxUSE_LISTBOOK
     if (GetSheetStyle() & wxPROPSHEET_LISTBOOK)
         bookCtrl = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 #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;
 }
 


@@ -211,7 +209,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();


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

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

 
 

+#endif // wxUSE_BOOKCTRL