Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk / filedlg.h

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 7cbbe54e43153ea4944e9e7230bd9ab84651ea92..ececadcf0b249f530810ef2b54b1f2ba258c7b61 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -43,7 +43,6 @@ public:
 
     virtual wxString GetPath() const;
     virtual void GetPaths(wxArrayString& paths) const;
 
     virtual wxString GetPath() const;
     virtual void GetPaths(wxArrayString& paths) const;

-    virtual wxString GetDirectory() const;

     virtual wxString GetFilename() const;
     virtual void GetFilenames(wxArrayString& files) const;
     virtual int GetFilterIndex() const;
     virtual wxString GetFilename() const;
     virtual void GetFilenames(wxArrayString& files) const;
     virtual int GetFilterIndex() const;


@@ -60,8 +59,8 @@ public:
     virtual bool SupportsExtraControl() const { return true; }
 
     // Implementation only.
     virtual bool SupportsExtraControl() const { return true; }
 
     // Implementation only.

-    void GTKOnAccept();
-    void GTKOnCancel();
+    void GTKSelectionChanged(const wxString& filename);
+

 
 protected:
     // override this from wxTLW since the native
 
 protected:
     // override this from wxTLW since the native


@@ -72,10 +71,10 @@ protected:
 
 
 private:
 
 
 private:

+    void OnFakeOk( wxCommandEvent &event );

     void OnSize(wxSizeEvent&);
     virtual void AddChildGTK(wxWindowGTK* child);
 
     void OnSize(wxSizeEvent&);
     virtual void AddChildGTK(wxWindowGTK* child);
 

-    wxString m_selectedDirectory;

     wxGtkFileChooser    m_fc;
 
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     wxGtkFileChooser    m_fc;
 
     DECLARE_DYNAMIC_CLASS(wxFileDialog)