Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the wxFD_... flags back into m_windowStyle

Browse Source 
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
This commit is contained in:
Robert Roebling
2006-10-27 08:45:22 +00:00
parent 44219ff04f
commit 45f4109c41
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/filedlg.h
View File

@@ -23,6 +23,16 @@
// wxFileDialog data // 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 enum
{ {
wxFD_OPEN = 0x0001, wxFD_OPEN = 0x0001,
@@ -30,8 +40,8 @@ enum
wxFD_OVERWRITE_PROMPT = 0x0004, wxFD_OVERWRITE_PROMPT = 0x0004,
wxFD_FILE_MUST_EXIST = 0x0010, wxFD_FILE_MUST_EXIST = 0x0010,
wxFD_MULTIPLE = 0x0020, wxFD_MULTIPLE = 0x0020,
wxFD_CHANGE_DIR = 0x0040, wxFD_CHANGE_DIR = 0x0080,
wxFD_PREVIEW = 0x0080 wxFD_PREVIEW = 0x0100
}; };
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6
@@ -88,7 +98,7 @@ public:
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr); 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 SetMessage(const wxString& message) { m_message = message; }
virtual void SetPath(const wxString& path) { m_path = path; } virtual void SetPath(const wxString& path) { m_path = path; }
@@ -133,7 +143,6 @@ protected:
wxString m_fileName; wxString m_fileName;
wxString m_wildCard; wxString m_wildCard;
int m_filterIndex; int m_filterIndex;
int m_fdStyle;
private: private:
void Init(); void Init();

4
src/common/fldlgcmn.cpp
View File

@@ -54,11 +54,11 @@ bool wxFileDialogBase::Create(wxWindow *parent,
m_wildCard = wildCard; m_wildCard = wildCard;
m_parent = parent; m_parent = parent;
m_fdStyle = style; m_windowStyle = style;
m_filterIndex = 0; m_filterIndex = 0;
if (!HasFdFlag(wxFD_OPEN) && !HasFdFlag(wxFD_SAVE)) 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 // check that the styles are not contradictory
wxASSERT_MSG( !(HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OPEN)), wxASSERT_MSG( !(HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OPEN)),