Make wxComboCtrlBase::Set*groundColour() methods public.

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

diff --git a/include/wx/preferences.h b/include/wx/preferences.h
index 935c7b1875db9393f903143fc1999ec093c7900c..7eee6482898a99bb247ee493969810c8fa2a476f 100644 (file)
--- a/include/wx/preferences.h
+++ b/include/wx/preferences.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxPreferencesEditor class.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19
-// RCS-ID:      $Id$
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,6 +11,9 @@
 #define _WX_PREFERENCES_H_
 
 #include "wx/defs.h"
+
+#if wxUSE_PREFERENCES_EDITOR
+
 #include "wx/bitmap.h"
 #include "wx/vector.h"
 
@@ -24,9 +26,13 @@ class wxPreferencesEditorImpl;
     #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
+    // The dialog is shown non-modally.
+    #define wxHAS_PREF_EDITOR_MODELESS
 #endif
 
 // ----------------------------------------------------------------------------
@@ -89,7 +95,9 @@ class WXDLLIMPEXP_CORE wxPreferencesEditor
 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.
@@ -100,8 +108,7 @@ public:
     // 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();
@@ -117,10 +124,22 @@ public:
 #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;
 
     wxDECLARE_NO_COPY_CLASS(wxPreferencesEditor);
 };
 
+#endif // wxUSE_PREFERENCES_EDITOR
+
 #endif // _WX_PREFERENCES_H_