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
This commit is contained in:
@@ -307,7 +307,7 @@ protected:
|
|||||||
long GetPickerStyle(long style) const
|
long GetPickerStyle(long style) const
|
||||||
{
|
{
|
||||||
return (style & (wxFLP_OPEN|wxFLP_SAVE|wxFLP_OVERWRITE_PROMPT|
|
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:
|
private:
|
||||||
@@ -409,7 +409,7 @@ protected:
|
|||||||
|
|
||||||
// extracts the style for our picker from wxFileDirPickerCtrlBase's style
|
// extracts the style for our picker from wxFileDirPickerCtrlBase's style
|
||||||
long GetPickerStyle(long style) const
|
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:
|
private:
|
||||||
DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl)
|
DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl)
|
||||||
|
Reference in New Issue
Block a user