Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/private/preferences.h b/include/wx/private/preferences.h
index 05ce8f5b1fcfbdc45930728e3b7f9f399ae2609f..7d0cb292fcf5e3d0e3569cda92e88d7b07795fb1 100644 (file)
--- a/include/wx/private/preferences.h
+++ b/include/wx/private/preferences.h
@@ -17,10 +17,6 @@
     #define wxHAS_PREF_EDITOR_NATIVE
 #endif
 
     #define wxHAS_PREF_EDITOR_NATIVE
 #endif
 

-#if defined(__WXOSX__) || defined(__WXGTK__)
-    #define wxHAS_PREF_EDITOR_MODELESS
-#endif
-

 // ----------------------------------------------------------------------------
 // wxPreferencesEditorImpl: defines wxPreferencesEditor implementation.
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPreferencesEditorImpl: defines wxPreferencesEditor implementation.
 // ----------------------------------------------------------------------------


@@ -29,7 +25,7 @@ class wxPreferencesEditorImpl
 {
 public:
     // This is implemented in a platform-specific way.
 {
 public:
     // This is implemented in a platform-specific way.

-    static wxPreferencesEditorImpl* Create();
+    static wxPreferencesEditorImpl* Create(const wxString& title);

 
     // These methods simply mirror the public wxPreferencesEditor ones.
     virtual void AddPage(wxPreferencesPage* page) = 0;
 
     // These methods simply mirror the public wxPreferencesEditor ones.
     virtual void AddPage(wxPreferencesPage* page) = 0;