From: Włodzimierz Skiba <abx@abx.art.pl> Date: Tue, 11 Jul 2006 07:53:25 +0000 (+0000) Subject: Fixed conflict between wxFilePicker and wxButton. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a7a11b21f565ed53e7bbf6ce7099ecf04423676c Fixed conflict between wxFilePicker and wxButton. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index fb0f10f6d8..8ca38a6c17 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -57,11 +57,11 @@ protected: // NB: these styles must be defined to carefully-chosen values to // avoid conflicts with wxButton's styles -#define wxFLP_OPEN 0x0200 -#define wxFLP_SAVE 0x0400 -#define wxFLP_OVERWRITE_PROMPT 0x0800 -#define wxFLP_FILE_MUST_EXIST 0x1000 -#define wxFLP_CHANGE_DIR 0x2000 +#define wxFLP_OPEN 0x0400 +#define wxFLP_SAVE 0x0800 +#define wxFLP_OVERWRITE_PROMPT 0x1000 +#define wxFLP_FILE_MUST_EXIST 0x2000 +#define wxFLP_CHANGE_DIR 0x4000 // NOTE: wxMULTIPLE is not supported !