removed src/gtk/eggtrayicon.h

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index c457e404e74cd5312a2e9cdb580afa8cef9cc5cc..a39f76d034e245098bd2e9c74218256937c5d697 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -218,7 +218,7 @@ void wxFileData::ReadData()
         }
     }
 
-    m_size = buff.st_size;
+    m_size = (long)buff.st_size;
 
     m_dateTime = buff.st_mtime;
 
@@ -476,7 +476,7 @@ void wxFileCtrl::UpdateItem(const wxListItem &item)
     fd->ReadData();
 
     SetItemText(item, fd->GetFileName());
-    SetItemImage(item, fd->GetImageId(), fd->GetImageId());
+    SetItemImage(item, fd->GetImageId());
 
     if (GetWindowStyleFlag() & wxLC_REPORT)
     {
@@ -823,6 +823,10 @@ void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool foward)
 
 wxFileCtrl::~wxFileCtrl()
 {
+    // Normally the data are freed via an EVT_LIST_DELETE_ALL_ITEMS event and
+    // wxFileCtrl::OnListDeleteAllItems. But if the event is generated after
+    // the destruction of the wxFileCtrl we need to free any data here:
+    FreeAllItemsData();
 }
 
 //-----------------------------------------------------------------------------
@@ -899,13 +903,6 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     m_path += defaultFile;
     m_filterExtension = wxEmptyString;
 
-    // interpret wildcards
-    wxArrayString wildDescriptions, wildFilters;
-    if ( !wxParseWildcard(m_wildCard, wildDescriptions, wildFilters) )
-    {
-        wxFAIL_MSG( wxT("Wrong file type description") );
-    }
-
     // layout
 
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
@@ -917,14 +914,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     wxBitmapButton *but;
 
     but = new wxBitmapButton(this, ID_LIST_MODE,
-                             wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG));
+                             wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
 
     but = new wxBitmapButton(this, ID_REPORT_MODE,
-                             wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG));
+                             wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif
@@ -933,7 +930,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     buttonsizer->Add( 30, 5, 1 );
 
     m_upDirButton = new wxBitmapButton(this, ID_UP_DIR,
-                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG));
+                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     m_upDirButton->SetToolTip( _("Go to parent directory") );
 #endif
@@ -941,7 +938,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
 #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
     but = new wxBitmapButton(this, ID_PARENT_DIR,
-                             wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG));
+                             wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
@@ -951,7 +948,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 #endif //!__DOS__
 
     m_newDirButton = new wxBitmapButton(this, ID_NEW_DIR,
-                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
+                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     m_newDirButton->SetToolTip( _("Create new directory") );
 #endif
@@ -974,7 +971,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         style2 |= wxLC_SINGLE_SEL;
 
     m_list = new wxFileCtrl( this, ID_LIST_CTRL,
-                             wildFilters[0], ms_lastShowHidden,
+                             _T(""), ms_lastShowHidden,
                              wxDefaultPosition, wxSize(540,200),
                              style2);
 
@@ -993,8 +990,8 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         textsizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
 
         buttonsizer = new wxBoxSizer( wxHORIZONTAL );
-        buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );
-        buttonsizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 5 );
+        buttonsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxALL, 5 );
+        buttonsizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 5 );
         mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
     }
     else
@@ -1004,7 +1001,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
         textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
-        textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+        textsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
         mainsizer->Add( textsizer, 0, wxEXPAND );
 
         wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
@@ -1013,15 +1010,11 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
         m_check->SetValue( ms_lastShowHidden );
         choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
-        choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
+        choicesizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 10 );
         mainsizer->Add( choicesizer, 0, wxEXPAND );
     }
 
-    for (size_t n=0; n<wildFilters.GetCount(); n++)
-    {
-        m_choice->Append( wildDescriptions[n], (void*) new wxString( wildFilters[n] ) );
-    }
-    SetFilterIndex( 0 );
+    SetWildcard(wildCard);
 
     SetAutoLayout( true );
     SetSizer( mainsizer );
@@ -1089,6 +1082,25 @@ void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
     }
 }
 
+void wxGenericFileDialog::SetWildcard(const wxString& wildCard)
+{
+    wxFileDialogBase::SetWildcard(wildCard);
+
+    wxArrayString wildDescriptions, wildFilters;
+    const size_t count = wxParseCommonDialogsFilter(m_wildCard,
+                                                    wildDescriptions,
+                                                    wildFilters);
+    wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") );
+
+    m_choice->Clear();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_choice->Append( wildDescriptions[n], new wxString( wildFilters[n] ) );
+    }
+
+    SetFilterIndex( 0 );
+}
+
 void wxGenericFileDialog::SetFilterIndex( int filterindex )
 {
     m_choice->SetSelection( filterindex );