diff --git a/docs/changes.txt b/docs/changes.txt index c364f90d38..2157b8be5e 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -109,6 +109,7 @@ wxGTK: - Support building wxGTK3 under Windows (Kolya Kosenko). - Fix vertical cell alignment in wxDataViewCtrl. - Fix clearing of wxComboBox with wxCB_READONLY (Chuddah). +- Fix GTK+ warnings for wxFileDialog with wxFD_MULTIPLE style. wxMSW: diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 678e47eba3..2d007c9c78 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -36,6 +36,7 @@ #define wxSYSTEM_MENU 0x00000800 wxBORDER_NONE = 0x00200000 #define wxRESIZE_BORDER 0x00000040 + #define wxDIALOG_NO_PARENT 0x00000020 */ enum @@ -45,9 +46,9 @@ enum wxFD_OVERWRITE_PROMPT = 0x0004, wxFD_NO_FOLLOW = 0x0008, wxFD_FILE_MUST_EXIST = 0x0010, - wxFD_MULTIPLE = 0x0020, wxFD_CHANGE_DIR = 0x0080, - wxFD_PREVIEW = 0x0100 + wxFD_PREVIEW = 0x0100, + wxFD_MULTIPLE = 0x0200 }; #define wxFD_DEFAULT_STYLE wxFD_OPEN diff --git a/interface/wx/filedlg.h b/interface/wx/filedlg.h index 9591dd52be..b8ca9451ed 100644 --- a/interface/wx/filedlg.h +++ b/interface/wx/filedlg.h @@ -12,9 +12,9 @@ enum wxFD_OVERWRITE_PROMPT = 0x0004, wxFD_NO_FOLLOW = 0x0008, wxFD_FILE_MUST_EXIST = 0x0010, - wxFD_MULTIPLE = 0x0020, wxFD_CHANGE_DIR = 0x0080, - wxFD_PREVIEW = 0x0100 + wxFD_PREVIEW = 0x0100, + wxFD_MULTIPLE = 0x0200 }; #define wxFD_DEFAULT_STYLE wxFD_OPEN