Don't crash in wxGridCellAutoWrapStringRenderer when the column is hidden.

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

diff --git a/src/generic/preferencesg.cpp b/src/generic/preferencesg.cpp
index 98170cf0719234083f9e06f08002cb5693d6af68..97236af30522c4a29a37a55e3b71a9edc60a3909 100644 (file)
--- a/src/generic/preferencesg.cpp
+++ b/src/generic/preferencesg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxPreferencesEditor.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19
 // Purpose:     Implementation of wxPreferencesEditor.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19

-// RCS-ID:      $Id$

 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -23,22 +22,29 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_PREFERENCES_EDITOR
+

 #include "wx/private/preferences.h"
 
 #ifndef wxHAS_PREF_EDITOR_NATIVE
 
 #include "wx/private/preferences.h"
 
 #ifndef wxHAS_PREF_EDITOR_NATIVE
 

+#include "wx/app.h"

 #include "wx/dialog.h"
 #include "wx/notebook.h"
 #include "wx/sizer.h"
 #include "wx/sharedptr.h"
 #include "wx/scopedptr.h"
 #include "wx/dialog.h"
 #include "wx/notebook.h"
 #include "wx/sizer.h"
 #include "wx/sharedptr.h"
 #include "wx/scopedptr.h"

+#include "wx/scopeguard.h"

 #include "wx/vector.h"
 
 #include "wx/vector.h"
 

+namespace
+{
+

 class wxGenericPrefsDialog : public wxDialog
 {
 public:
 class wxGenericPrefsDialog : public wxDialog
 {
 public:

-    wxGenericPrefsDialog(wxWindow *parent)
-        : wxDialog(parent, wxID_ANY, _("Preferences"),
+    wxGenericPrefsDialog(wxWindow *parent, const wxString& title)
+        : wxDialog(parent, wxID_ANY, title,

                    wxDefaultPosition, wxDefaultSize,
                    wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX))
     {
                    wxDefaultPosition, wxDefaultSize,
                    wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX))
     {


@@ -65,6 +71,16 @@ public:
         m_notebook->AddPage(win, page->GetName());
     }
 
         m_notebook->AddPage(win, page->GetName());
     }
 

+    int GetSelectedPage() const
+    {
+        return m_notebook->GetSelection();
+    }
+
+    void SelectPage(int page)
+    {
+        m_notebook->ChangeSelection(page);
+    }
+

 private:
     wxNotebook *m_notebook;
 };
 private:
     wxNotebook *m_notebook;
 };


@@ -73,6 +89,11 @@ private:
 class wxGenericPreferencesEditorImplBase : public wxPreferencesEditorImpl
 {
 public:
 class wxGenericPreferencesEditorImplBase : public wxPreferencesEditorImpl
 {
 public:

+    void SetTitle(const wxString& title)
+    {
+        m_title = title;
+    }
+

     virtual void AddPage(wxPreferencesPage* page)
     {
         m_pages.push_back(wxSharedPtr<wxPreferencesPage>(page));
     virtual void AddPage(wxPreferencesPage* page)
     {
         m_pages.push_back(wxSharedPtr<wxPreferencesPage>(page));


@@ -81,7 +102,15 @@ public:
 protected:
     wxGenericPrefsDialog *CreateDialog(wxWindow *parent)
     {
 protected:
     wxGenericPrefsDialog *CreateDialog(wxWindow *parent)
     {

-        wxGenericPrefsDialog *dlg = new wxGenericPrefsDialog(parent);
+        if ( m_title.empty() )
+        {
+            // Use the default title, which should include the application name
+            // under both MSW and GTK (and OSX uses its own native
+            // implementation anyhow).
+            m_title.Printf(_("%s Preferences"), wxTheApp->GetAppDisplayName());
+        }
+
+        wxGenericPrefsDialog *dlg = new wxGenericPrefsDialog(parent, m_title);

 
         // TODO: Don't create all pages immediately like this, do it on demand
         //       when a page is selected in the notebook (as is done on OS X).
 
         // TODO: Don't create all pages immediately like this, do it on demand
         //       when a page is selected in the notebook (as is done on OS X).


@@ -97,12 +126,16 @@ protected:
             dlg->AddPage(i->get());
         }
 
             dlg->AddPage(i->get());
         }
 

+        dlg->Fit();
+

         return dlg;
     }
 
     typedef wxVector< wxSharedPtr<wxPreferencesPage> > Pages;
     Pages m_pages;
 
         return dlg;
     }
 
     typedef wxVector< wxSharedPtr<wxPreferencesPage> > Pages;
     Pages m_pages;
 

+private:
+    wxString m_title;

 };
 
 
 };
 
 


@@ -151,35 +184,77 @@ private:
     wxWeakRef<wxWindow> m_win;
 };
 
     wxWeakRef<wxWindow> m_win;
 };
 

+inline
+wxGenericPreferencesEditorImplBase* NewGenericImpl()
+{
+    return new wxModelessPreferencesEditorImpl;
+}
+

 #else // !wxHAS_PREF_EDITOR_MODELESS
 
 class wxModalPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase
 {
 public:
 #else // !wxHAS_PREF_EDITOR_MODELESS
 
 class wxModalPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase
 {
 public:

+    wxModalPreferencesEditorImpl()
+    {
+        m_dlg = NULL;
+        m_currentPage = -1;
+    }
+

     virtual void Show(wxWindow* parent)
     {
         wxScopedPtr<wxGenericPrefsDialog> dlg(CreateDialog(parent));
     virtual void Show(wxWindow* parent)
     {
         wxScopedPtr<wxGenericPrefsDialog> dlg(CreateDialog(parent));

-        dlg->Fit();
-        dlg->ShowModal();
+
+        // Store it for Dismiss() but ensure that the pointer is reset to NULL
+        // when the dialog is destroyed on leaving this function.
+        m_dlg = dlg.get();
+        wxON_BLOCK_EXIT_NULL(m_dlg);
+
+        // Restore the previously selected page, if any.
+        if ( m_currentPage != -1 )
+            dlg->SelectPage(m_currentPage);
+
+        // Don't remember the last selected page if the dialog was cancelled.
+        if ( dlg->ShowModal() != wxID_CANCEL )
+            m_currentPage = dlg->GetSelectedPage();

     }
 
     virtual void Dismiss()
     {
     }
 
     virtual void Dismiss()
     {

-        // nothing to do
+        if ( m_dlg )
+        {
+            m_dlg->EndModal(wxID_CANCEL);
+            m_dlg = NULL;
+        }

     }
     }

+
+private:
+    wxGenericPrefsDialog* m_dlg;
+    int m_currentPage;
+
+    wxDECLARE_NO_COPY_CLASS(wxModalPreferencesEditorImpl);

 };
 
 };
 

+inline
+wxGenericPreferencesEditorImplBase* NewGenericImpl()
+{
+    return new wxModalPreferencesEditorImpl;
+}
+

 #endif // !wxHAS_PREF_EDITOR_MODELESS
 
 #endif // !wxHAS_PREF_EDITOR_MODELESS
 

+} // anonymous namespace

 
 /*static*/
 
 /*static*/

-wxPreferencesEditorImpl* wxPreferencesEditorImpl::Create()
+wxPreferencesEditorImpl* wxPreferencesEditorImpl::Create(const wxString& title)

 {
 {

-#ifdef wxHAS_PREF_EDITOR_MODELESS
-    return new wxModelessPreferencesEditorImpl();
-#else
-    return new wxModalPreferencesEditorImpl();
-#endif
+    wxGenericPreferencesEditorImplBase* const impl = NewGenericImpl();
+
+    impl->SetTitle(title);
+
+    return impl;

 }
 
 #endif // !wxHAS_PREF_EDITOR_NATIVE
 }
 
 #endif // !wxHAS_PREF_EDITOR_NATIVE

+
+#endif // wxUSE_PREFERENCES_EDITOR