From 723b3994e0664e07af40186b3f0c3016890ef670 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 12 Feb 2009 21:09:20 +0000 Subject: [PATCH] wxFilePickerCtrl's button should know if it has an associated text control git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/filepicker.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index b4450c93d6..7e14d097d9 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -307,7 +307,7 @@ protected: long GetPickerStyle(long style) const { return (style & (wxFLP_OPEN|wxFLP_SAVE|wxFLP_OVERWRITE_PROMPT| - wxFLP_FILE_MUST_EXIST|wxFLP_CHANGE_DIR)); + wxFLP_FILE_MUST_EXIST|wxFLP_CHANGE_DIR|wxFLP_USE_TEXTCTRL)); } private: @@ -409,7 +409,7 @@ protected: // extracts the style for our picker from wxFileDirPickerCtrlBase's style long GetPickerStyle(long style) const - { return (style & (wxDIRP_DIR_MUST_EXIST|wxDIRP_CHANGE_DIR)); } + { return (style & (wxDIRP_DIR_MUST_EXIST|wxDIRP_CHANGE_DIR|wxDIRP_USE_TEXTCTRL)); } private: DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl) -- 2.47.2