Move the wxFD_... flags back into m_windowStyle

    as requested. Add the list if flags, with which
    the wxFD_ flags have to cooperate into the
    header of wxFileDialog.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 87f95d509aeddaefe92148d3b5687d183fbf05a2..8a16ded2628538f1ec8cc4a430985e00ccefeff6 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -23,6 +23,16 @@
 // wxFileDialog data
 //----------------------------------------------------------------------------
 
+/*
+    The flags below must coexist with the following flags in m_windowStyle
+    #define wxCAPTION               0x20000000
+    #define wxMAXIMIZE              0x00002000
+    #define wxCLOSE_BOX             0x00001000
+    #define wxSYSTEM_MENU           0x00000800
+    wxBORDER_NONE   =               0x00200000
+    #define wxRESIZE_BORDER         0x00000040
+*/
+
 enum
 {
     wxFD_OPEN              = 0x0001,
@@ -30,8 +40,8 @@ enum
     wxFD_OVERWRITE_PROMPT  = 0x0004,
     wxFD_FILE_MUST_EXIST   = 0x0010,
     wxFD_MULTIPLE          = 0x0020,
-    wxFD_CHANGE_DIR        = 0x0040,
-    wxFD_PREVIEW           = 0x0080
+    wxFD_CHANGE_DIR        = 0x0080,
+    wxFD_PREVIEW           = 0x0100
 };
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -88,7 +98,7 @@ public:
                 const wxSize& sz = wxDefaultSize,
                 const wxString& name = wxFileDialogNameStr);
 
-    bool HasFdFlag(int flag) const { return (m_fdStyle & flag) != 0; }
+    bool HasFdFlag(int flag) const { return HasFlag(flag); }
 
     virtual void SetMessage(const wxString& message) { m_message = message; }
     virtual void SetPath(const wxString& path) { m_path = path; }
@@ -133,7 +143,6 @@ protected:
     wxString      m_fileName;
     wxString      m_wildCard;
     int           m_filterIndex;
-    int           m_fdStyle;
 
 private:
     void Init();

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index d324140022d43e772a6f05416a898ea9a40110e0..ecaa62b0a028a7e34e2b08c1228a4f47846d2619 100644 (file)
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -54,11 +54,11 @@ bool wxFileDialogBase::Create(wxWindow *parent,
     m_wildCard = wildCard;
 
     m_parent = parent;
-    m_fdStyle = style;
+    m_windowStyle = style;
     m_filterIndex = 0;
 
     if (!HasFdFlag(wxFD_OPEN) && !HasFdFlag(wxFD_SAVE))
-        m_fdStyle |= wxFD_OPEN;     // wxFD_OPEN is the default
+        m_windowStyle |= wxFD_OPEN;     // wxFD_OPEN is the default
 
     // check that the styles are not contradictory
     wxASSERT_MSG( !(HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OPEN)),