Applied patch [ 1188724 ] missing header in carbon CFM builds

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

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 90b72aad0ece810dfc12151287aeceaf46eff646..cc1fbc59c7e8def2e6687d3fce4b1d84e7c43366 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        propdlg.cpp
+// Name:        src/generic/propdlg.cpp

 // Purpose:     wxPropertySheetDialog
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxPropertySheetDialog
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "propdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,6 +18,8 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_BOOKCTRL
+

 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/sizer.h"
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/sizer.h"


@@ -30,8 +28,9 @@
     #include "wx/msgdlg.h"
 #endif
 
     #include "wx/msgdlg.h"
 #endif
 

-#include "wx/notebook.h"
+#include "wx/bookctrl.h"

 #include "wx/generic/propdlg.h"
 #include "wx/generic/propdlg.h"

+#include "wx/sysopt.h"

 
 //-----------------------------------------------------------------------------
 // wxPropertySheetDialog
 
 //-----------------------------------------------------------------------------
 // wxPropertySheetDialog


@@ -39,21 +38,25 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog)
 

-bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title, 
+BEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
+    EVT_ACTIVATE(wxPropertySheetDialog::OnActivate)
+END_EVENT_TABLE()
+
+bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title,

                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {

-    if (!wxDialog::Create(parent, id, title, pos, sz, style, name))
+    if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name))

         return false;
         return false;

-    
+

     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
     SetSizer(topSizer);
 
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
     SetSizer(topSizer);
 
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 

-    int extraSpace = 5;
-#ifdef __WXWINCE__
+    int extraSpace = 2;
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)

     extraSpace=0;
 #endif
     topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
     extraSpace=0;
 #endif
     topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);


@@ -73,40 +76,85 @@ void wxPropertySheetDialog::Init()
 // Layout the dialog, to be called after pages have been created
 void wxPropertySheetDialog::LayoutDialog()
 {
 // Layout the dialog, to be called after pages have been created
 void wxPropertySheetDialog::LayoutDialog()
 {

-#ifndef __WXWINCE__
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     GetSizer()->Fit(this);
     GetSizer()->Fit(this);

+    GetSizer()->SetSizeHints(this);

     Centre(wxBOTH);
 #endif
     Centre(wxBOTH);
 #endif

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

 }
 
 // Creates the buttons, if any
 void wxPropertySheetDialog::CreateButtons(int flags)
 {
 }
 
 // Creates the buttons, if any
 void wxPropertySheetDialog::CreateButtons(int flags)
 {

-#ifndef __WXWINCE__
-    wxSizer* sizer = CreateButtonSizer(flags);
-    m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
+#ifdef __POCKETPC__
+    // keep system option status
+    const wxChar *optionName = wxT("wince.dialog.real-ok-cancel");
+    const int status = wxSystemOptions::GetOptionInt(optionName);
+    wxSystemOptions::SetOption(optionName,0);
+#endif
+
+    wxSizer *buttonSizer = CreateButtonSizer( flags & ButtonSizerFlags );
+    if(buttonSizer->GetChildren().GetCount() > 0 )
+    {
+        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
+    wxSystemOptions::SetOption(optionName,status);

 #endif
 }
 
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
 #endif
 }
 
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {

-    int style = 0;
-#ifdef __WXWINCE__
-    style |= wxNB_BOTTOM|wxNB_FLAT;
+    int style = wxCLIP_CHILDREN;
+#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
+    style |= wxBK_BOTTOM|wxNB_FLAT;
+#else
+    style |= wxBK_DEFAULT;

 #endif
 #endif

-    return new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+    return new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );

 }
 
 // Adds the book control to the inner sizer.
 void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
 {
 }
 
 // Adds the book control to the inner sizer.
 void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
 {

-#ifdef __WXWINCE__
+#if defined(__POCKETPC__) && wxUSE_NOTEBOOK

     // The book control has to be sized larger than the dialog because of a border bug
     // in WinCE
     // The book control has to be sized larger than the dialog because of a border bug
     // in WinCE

-    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, -3 );
+    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 );
 #endif
 }
 
 #else
     sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 #endif
 }
 

+void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
+{
+#if defined(__SMARTPHONE__)
+    // Attempt to focus the choice control: not yet working, but might
+    // be a step in the right direction. OnActivate overrides the default
+    // handler in toplevel.cpp that sets the focus for the first child of
+    // of the dialog (the choicebook).
+    if (event.GetActive())
+    {
+        wxChoicebook* choiceBook = wxDynamicCast(GetBookCtrl(), wxChoicebook);
+        if (choiceBook)
+            choiceBook->SetFocus();
+    }
+    else
+#endif
+        event.Skip();
+}
+
+#endif // wxUSE_BOOKCTRL