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

deprecate unneeded wxDIRCTRL_SHOW_FILTERS style, just always show the filters if they're present (modified patch 1719448)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-24 00:14:59 +00:00
parent b4ff336e1d
commit d0bc78e2bf
6 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/generic/dirctrlg.cpp
View File

@@ -470,7 +470,6 @@ wxBEGIN_FLAGS( wxGenericDirCtrlStyle )
wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)
wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)
wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)
wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
wxEND_FLAGS( wxGenericDirCtrlStyle )
@@ -564,27 +563,17 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
else
treeStyle |= wxBORDER_SUNKEN;
long filterStyle = 0;
if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
filterStyle |= wxNO_BORDER;
else
filterStyle |= wxBORDER_SUNKEN;
m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL,
wxPoint(0,0), GetClientSize(), treeStyle);
if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS))
m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle);
if (!filter.empty())
m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
m_defaultPath = dir;
m_filter = filter;
if (m_filter.empty())
#ifdef __UNIX__
m_filter = wxT("*");
#else
m_filter = wxT("*.*");
#endif
m_filter = wxFileSelectorDefaultWildcardStr;
SetFilterIndex(defaultFilter);
@@ -1182,6 +1171,14 @@ void wxGenericDirCtrl::SetFilter(const wxString& filter)
{
m_filter = filter;
if (!filter.empty() && !m_filterListCtrl)
m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
else if (filter.empty() && m_filterListCtrl)
{
m_filterListCtrl->Destroy();
m_filterListCtrl = NULL;
}
wxString f, d;
if (ExtractWildcard(m_filter, m_currentFilter, f, d))
m_currentFilterStr = f;
@@ -1191,6 +1188,10 @@ void wxGenericDirCtrl::SetFilter(const wxString& filter)
#else
m_currentFilterStr = wxT("*.*");
#endif
// current filter index is meaningless after filter change, set it to zero
SetFilterIndex(0);
if (m_filterListCtrl)
m_filterListCtrl->FillFilterList(m_filter, 0);
}
// Extract description and actual filter from overall filter string
@@ -1267,12 +1268,21 @@ BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter)
END_EVENT_TABLE()
bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, const wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style)
bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
const wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style)
{
m_dirCtrl = parent;
// by default our border style is determined by the style of our parent
if ( !(style & wxBORDER_MASK) )
{
style |= parent->HasFlag(wxDIRCTRL_3D_INTERNAL) ? wxBORDER_SUNKEN
: wxBORDER_NONE;
}
return wxChoice::Create(parent, id, pos, size, 0, NULL, style);
}