*** empty log message ***

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5a6f3fe32869d95fbededc97359cbd6b15e46405..78ceba169a93b70deb856d6261ba8ce72ba1ccf6 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -244,14 +244,14 @@ void wxFileData::SetNewName( const wxString &name, const wxString &fname )
 void wxFileData::MakeItem( wxListItem &item )
 {
     item.m_text = m_name;
-    item.m_colour = wxBLACK;
-    if (IsExe()) item.m_colour = wxRED;
-    if (IsDir()) item.m_colour = wxBLUE;
-    if (IsDir()) item.m_image = 0; else item.m_image = -1;
+    item.ClearAttributes();
+    if (IsExe()) item.SetTextColour(*wxRED);
+    if (IsDir()) item.SetTextColour(*wxBLUE);
+    item.m_image = IsDir() ? 0 : -1;
     if (IsLink())
     {
         wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
-        item.m_colour = dg;
+        item.SetTextColour(*dg);
     }
     item.m_data = (long)this;
 }
@@ -576,7 +576,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     m_dialogStyle = style;
     
     if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
-        m_dialogStyle &= ~wxMULTIPLE;
+        m_dialogStyle |= wxOPEN;
     
     m_dir = defaultDir;
     if (m_dir.IsEmpty())