Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / preferences.h

diff --git a/include/wx/preferences.h b/include/wx/preferences.h
index 935c7b1875db9393f903143fc1999ec093c7900c..fb6387a0757a8314ae8d66c0c01e189add01354b 100644 (file)
--- a/include/wx/preferences.h
+++ b/include/wx/preferences.h
@@ -24,9 +24,13 @@ class wxPreferencesEditorImpl;
     #define wxHAS_PREF_EDITOR_ICONS
     // Changes should be applied immediately
     #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY
     #define wxHAS_PREF_EDITOR_ICONS
     // Changes should be applied immediately
     #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY

+    // The dialog is shown non-modally.
+    #define wxHAS_PREF_EDITOR_MODELESS

 #elif defined(__WXGTK__)
     // Changes should be applied immediately
     #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY
 #elif defined(__WXGTK__)
     // Changes should be applied immediately
     #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY

+    // The dialog is shown non-modally.
+    #define wxHAS_PREF_EDITOR_MODELESS

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -89,7 +93,9 @@ class WXDLLIMPEXP_CORE wxPreferencesEditor
 public:
     // Ctor creates an empty editor, use AddPage() to add controls to it.
     wxPreferencesEditor(const wxString& title = wxString());
 public:
     // Ctor creates an empty editor, use AddPage() to add controls to it.
     wxPreferencesEditor(const wxString& title = wxString());

-    ~wxPreferencesEditor();
+
+    // Dtor destroys the dialog if still shown.
+    virtual ~wxPreferencesEditor();

 
     // Add a new page to the editor. The editor takes ownership of the page
     // and won't delete it until it is destroyed itself.
 
     // Add a new page to the editor. The editor takes ownership of the page
     // and won't delete it until it is destroyed itself.


@@ -100,8 +106,7 @@ public:
     // platform, i.e. depending on whether the dialog is modal or not.
     virtual void Show(wxWindow* parent);
 
     // platform, i.e. depending on whether the dialog is modal or not.
     virtual void Show(wxWindow* parent);
 

-    // Hide the currently shown dialog, if any. This doesn't do anything on the
-    // platforms using modal preferences dialogs but should be called to
+    // Hide the currently shown dialog, if any. This is typically used to

     // dismiss the dialog if the object whose preferences it is editing was
     // closed.
     void Dismiss();
     // dismiss the dialog if the object whose preferences it is editing was
     // closed.
     void Dismiss();


@@ -117,6 +122,16 @@ public:
 #endif
     }
 
 #endif
     }
 

+    // Whether the dialog is shown modally, i.e. Show() blocks, or not.
+    static bool ShownModally()
+    {
+#ifdef wxHAS_PREF_EDITOR_MODELESS
+        return false;
+#else
+        return true;
+#endif
+    }
+

 private:
     wxPreferencesEditorImpl* m_impl;
 
 private:
     wxPreferencesEditorImpl* m_impl;