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

Change wxFD_MULTIPLE value to avoid conflict with wxDIALOG_NO_PARENT.

Browse Source 
This avoids GTK+ warnings about creating a dialog without parent when a
wxFileDialog with wxFD_MULTIPLE style is created.

Closes #16863.
This commit is contained in:
Vadim Zeitlin
2015-03-02 14:32:53 +01:00
parent 3bec79d71c
commit b7388f36f2
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -109,6 +109,7 @@ wxGTK:
- Support building wxGTK3 under Windows (Kolya Kosenko). - Support building wxGTK3 under Windows (Kolya Kosenko).
- Fix vertical cell alignment in wxDataViewCtrl. - Fix vertical cell alignment in wxDataViewCtrl.
- Fix clearing of wxComboBox with wxCB_READONLY (Chuddah). - Fix clearing of wxComboBox with wxCB_READONLY (Chuddah).
- Fix GTK+ warnings for wxFileDialog with wxFD_MULTIPLE style.
wxMSW: wxMSW:

5
include/wx/filedlg.h
View File

@@ -36,6 +36,7 @@
#define wxSYSTEM_MENU 0x00000800 #define wxSYSTEM_MENU 0x00000800
wxBORDER_NONE = 0x00200000 wxBORDER_NONE = 0x00200000
#define wxRESIZE_BORDER 0x00000040 #define wxRESIZE_BORDER 0x00000040
#define wxDIALOG_NO_PARENT 0x00000020
*/ */
enum enum
@@ -45,9 +46,9 @@ enum
wxFD_OVERWRITE_PROMPT = 0x0004, wxFD_OVERWRITE_PROMPT = 0x0004,
wxFD_NO_FOLLOW = 0x0008, wxFD_NO_FOLLOW = 0x0008,
wxFD_FILE_MUST_EXIST = 0x0010, wxFD_FILE_MUST_EXIST = 0x0010,
wxFD_MULTIPLE = 0x0020,
wxFD_CHANGE_DIR = 0x0080, wxFD_CHANGE_DIR = 0x0080,
wxFD_PREVIEW = 0x0100 wxFD_PREVIEW = 0x0100,
wxFD_MULTIPLE = 0x0200
}; };
#define wxFD_DEFAULT_STYLE wxFD_OPEN #define wxFD_DEFAULT_STYLE wxFD_OPEN

4
interface/wx/filedlg.h
View File

@@ -12,9 +12,9 @@ enum
wxFD_OVERWRITE_PROMPT = 0x0004, wxFD_OVERWRITE_PROMPT = 0x0004,
wxFD_NO_FOLLOW = 0x0008, wxFD_NO_FOLLOW = 0x0008,
wxFD_FILE_MUST_EXIST = 0x0010, wxFD_FILE_MUST_EXIST = 0x0010,
wxFD_MULTIPLE = 0x0020,
wxFD_CHANGE_DIR = 0x0080, wxFD_CHANGE_DIR = 0x0080,
wxFD_PREVIEW = 0x0100 wxFD_PREVIEW = 0x0100,
wxFD_MULTIPLE = 0x0200
}; };
#define wxFD_DEFAULT_STYLE wxFD_OPEN #define wxFD_DEFAULT_STYLE wxFD_OPEN