disable select root menu command when the root is hidden

[wxWidgets.git] / src / common / fldlgcmn.cpp

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 115881214a2aace947819510a76fa38bc2bd1a14..7607a2a3ed6356aa3c3b78bd7b54f85856e8994b 100644 (file)
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/fldlgcmn.cpp
+// Name:        src/common/fldlgcmn.cpp
 // Purpose:     wxFileDialog common functions
 // Author:      John Labenski
 // Modified by:
@@ -16,16 +16,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_FILEDLG
+
+#include "wx/filedlg.h"
+#include "wx/dirdlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/window.h"
 #endif // WX_PRECOMP
 
-#include "wx/filedlg.h"
-
-#if wxUSE_FILEDLG
-
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
@@ -57,15 +58,18 @@ bool wxFileDialogBase::Create(wxWindow *parent,
     m_windowStyle = style;
     m_filterIndex = 0;
 
+    if (!HasFdFlag(wxFD_OPEN) && !HasFdFlag(wxFD_SAVE))
+        m_windowStyle |= wxFD_OPEN;     // wxFD_OPEN is the default
+
     // check that the styles are not contradictory
-    wxASSERT_MSG( !(HasFlag(wxFD_SAVE) && HasFlag(wxFD_OPEN)),
+    wxASSERT_MSG( !(HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OPEN)),
                   _T("can't specify both wxFD_SAVE and wxFD_OPEN at once") );
 
-    wxASSERT_MSG( !HasFlag(wxFD_SAVE) ||
-                    (!HasFlag(wxFD_MULTIPLE) && !HasFlag(wxFD_FILE_MUST_EXIST)),
+    wxASSERT_MSG( !HasFdFlag(wxFD_SAVE) ||
+                    (!HasFdFlag(wxFD_MULTIPLE) && !HasFdFlag(wxFD_FILE_MUST_EXIST)),
                    _T("wxFD_MULTIPLE or wxFD_FILE_MUST_EXIST can't be used with wxFD_SAVE" ) );
 
-    wxASSERT_MSG( !HasFlag(wxFD_OPEN) || !HasFlag(wxFD_OVERWRITE_PROMPT),
+    wxASSERT_MSG( !HasFdFlag(wxFD_OPEN) || !HasFdFlag(wxFD_OVERWRITE_PROMPT),
                   _T("wxFD_OVERWRITE_PROMPT can't be used with wxFD_OPEN") );
 
     if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
@@ -98,17 +102,18 @@ bool wxFileDialogBase::Create(wxWindow *parent,
     return true;
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-// Parses the filterStr, returning the number of filters.
-// Returns 0 if none or if there's a problem.
-// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
-int wxFileDialogBase::ParseWildcard(const wxString& filterStr,
-                                    wxArrayString& descriptions,
-                                    wxArrayString& filters)
+#if WXWIN_COMPATIBILITY_2_6
+long wxFileDialogBase::GetStyle() const
+{
+    return GetWindowStyle();
+}
+
+void wxFileDialogBase::SetStyle(long style)
 {
-    return ::wxParseCommonDialogsFilter(filterStr, descriptions, filters);
+    SetWindowStyle(style);
 }
-#endif // WXWIN_COMPATIBILITY_2_4
+#endif // WXWIN_COMPATIBILITY_2_6
+
 
 wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
                                            const wxString &extensionList)
@@ -118,7 +123,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
 
     // if fileName is of form "foo.bar" it's ok, return it
     int idx_dot = fileName.Find(wxT('.'), true);
-    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.Len() - 1))
+    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.length() - 1))
         return filePath;
 
     // get the first extension from extensionList, or all of it
@@ -126,7 +131,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
 
     // if ext == "foo" or "foo." there's no extension
     int idx_ext_dot = ext.Find(wxT('.'), true);
-    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.Len() - 1))
+    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.length() - 1))
         return filePath;
     else
         ext = ext.AfterLast(wxT('.'));
@@ -310,5 +315,22 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
     return wxDefaultFileSelector(false, what, extension, default_name, parent);
 }
 
-#endif // wxUSE_FILEDLG
 
+//----------------------------------------------------------------------------
+// wxDirDialogBase
+//----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_6
+long wxDirDialogBase::GetStyle() const
+{
+    return GetWindowStyle();
+}
+
+void wxDirDialogBase::SetStyle(long style)
+{
+    SetWindowStyle(style);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
+#endif // wxUSE_FILEDLG