X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..d29bf6775a132497c0190926cc7e9e3ec425e5a7:/include/wx/generic/filedlgg.h

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index f8edaa82af..e94d7d5468 100644
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -45,7 +45,7 @@ class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
 {
 public:
-    wxGenericFileDialog();
+    wxGenericFileDialog() { }
 
     wxGenericFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
@@ -68,6 +68,7 @@ public:
     // -------------------------------
 
     virtual int ShowModal();
+    virtual bool Show( bool show = true );
 
     void OnSelected( wxListEvent &event );
     void OnActivated( wxListEvent &event );
@@ -115,15 +116,18 @@ class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 
 public:
-     wxFileDialog();
+     wxFileDialog() {}
 
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
-                 const wxString& defaultDir = _T(""),
-                 const wxString& defaultFile = _T(""),
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
-                 const wxPoint& pos = wxDefaultPosition);
+                 const wxPoint& pos = wxDefaultPosition)
+          :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
+     {
+     }
 };
 
 #endif // USE_GENERIC_FILEDIALOG
@@ -145,11 +149,14 @@ public:
     };
 
     // Full copy constructor
-    wxFileData( const wxFileData& fileData );
+    wxFileData( const wxFileData& fileData ) { Copy(fileData); }
     // Create a filedata from this information
     wxFileData( const wxString &filePath, const wxString &fileName,
                 fileType type, int image_id );
 
+    // make a full copy of the other wxFileData
+    void Copy( const wxFileData &other );
+
     // (re)read the extra data about the file from the system
     void ReadData();
 
@@ -203,6 +210,9 @@ public:
     // initialize a wxListItem attributes
     void MakeItem( wxListItem &item );
 
+
+    wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; }
+
 private:
     wxString m_fileName;
     wxString   m_filePath;
@@ -235,7 +245,7 @@ public:
     virtual void ChangeToListMode();
     virtual void ChangeToReportMode();
     virtual void ChangeToSmallIconMode();
-    virtual void ShowHidden( bool show = TRUE );
+    virtual void ShowHidden( bool show = true );
     bool GetShowHidden() const { return m_showHidden; }
 
     virtual long Add( wxFileData *fd, wxListItem &item );
@@ -250,6 +260,7 @@ public:
     wxString GetDir() const { return m_dirName; }
 
     void OnListDeleteItem( wxListEvent &event );
+    void OnListDeleteAllItems( wxListEvent &event );
     void OnListEndLabelEdit( wxListEvent &event );
     void OnListColClick( wxListEvent &event );
 
@@ -258,7 +269,7 @@ public:
     wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
 
 protected:
-    void FreeItemData(const wxListItem& item);
+    void FreeItemData(wxListItem& item);
     void FreeAllItemsData();
 
     wxString      m_dirName;