X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82c1f2a390cfba80a1942e763efd14de512e76e7..8812e0986833a7b3cdf8cf113974c7c23f05ad18:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 9b12eb10d1..13050d865b 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -504,7 +504,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, Init(); long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT; - + #ifdef __WXGTK20__ treeStyle |= wxTR_NO_LINES; #endif @@ -524,7 +524,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, filterStyle |= wxBORDER_SUNKEN; m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL, - wxPoint(0,0), GetClientSize(), treeStyle); + wxPoint(), GetClientSize(), treeStyle); if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS)) m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle); @@ -553,7 +553,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData); m_treeCtrl->SetItemHasChildren(m_rootId); ExpandDir(m_rootId); // automatically expand first level - + // Expand and select the default path if (!m_defaultPath.empty()) { @@ -1253,6 +1253,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt // wxFileIconsTable icons // ---------------------------------------------------------------------------- +#ifndef __WXGTK24__ /* Computer */ static const char * file_icons_tbl_computer_xpm[] = { "16 16 7 1", @@ -1279,6 +1280,7 @@ static const char * file_icons_tbl_computer_xpm[] = { " .oXoXoXoXoXo.o ", ".XOXXXXXXXXX.o ", "............o "}; +#endif // GTK+ < 2.4 // ---------------------------------------------------------------------------- // wxFileIconsTable & friends