fixed sending 2 events (normal and bogus cancel one) when ending to edit a tree ctrl...

[wxWidgets.git] / include / wx / generic / filedlgg.h

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 22b50f98009285953fc54b8e3968accee0c134aa..e94d7d546806a40cfde431c4f72931b01191da9b 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -68,6 +68,7 @@ public:
     // -------------------------------
 
     virtual int ShowModal();
     // -------------------------------
 
     virtual int ShowModal();

+    virtual bool Show( bool show = true );

 
     void OnSelected( wxListEvent &event );
     void OnActivated( wxListEvent &event );
 
     void OnSelected( wxListEvent &event );
     void OnActivated( wxListEvent &event );


@@ -119,8 +120,8 @@ public:
 
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
 
     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 wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition)


@@ -148,11 +149,14 @@ public:
     };
 
     // Full copy constructor
     };
 
     // 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 );
 
     // 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();
 
     // (re)read the extra data about the file from the system
     void ReadData();
 


@@ -206,6 +210,9 @@ public:
     // initialize a wxListItem attributes
     void MakeItem( wxListItem &item );
 
     // initialize a wxListItem attributes
     void MakeItem( wxListItem &item );
 

+
+    wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; }
+

 private:
     wxString m_fileName;
     wxString   m_filePath;
 private:
     wxString m_fileName;
     wxString   m_filePath;


@@ -238,7 +245,7 @@ public:
     virtual void ChangeToListMode();
     virtual void ChangeToReportMode();
     virtual void ChangeToSmallIconMode();
     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 );
     bool GetShowHidden() const { return m_showHidden; }
 
     virtual long Add( wxFileData *fd, wxListItem &item );


@@ -253,6 +260,7 @@ public:
     wxString GetDir() const { return m_dirName; }
 
     void OnListDeleteItem( wxListEvent &event );
     wxString GetDir() const { return m_dirName; }
 
     void OnListDeleteItem( wxListEvent &event );

+    void OnListDeleteAllItems( wxListEvent &event );

     void OnListEndLabelEdit( wxListEvent &event );
     void OnListColClick( wxListEvent &event );
 
     void OnListEndLabelEdit( wxListEvent &event );
     void OnListColClick( wxListEvent &event );
 


@@ -261,7 +269,7 @@ public:
     wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
 
 protected:
     wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
 
 protected:

-    void FreeItemData(const wxListItem& item);
+    void FreeItemData(wxListItem& item);

     void FreeAllItemsData();
 
     wxString      m_dirName;
     void FreeAllItemsData();
 
     wxString      m_dirName;