Add support for the new history functions to the ie backend. For this we manage our...

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

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 1e37455f3cf129f4bcebe60ae150a127704a34f3..08854018e54fe7a9df62148285d7b966e429c0c6 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.h
+// Name:        wx/gtk/filedlg.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,21 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTKFILEDLG_H_
+#define _WX_GTKFILEDLG_H_

 
 

-#ifndef __GTKFILEDLGH__
-#define __GTKFILEDLGH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/generic/filedlgg.h"
+#include "wx/gtk/filectrl.h"    // for wxGtkFileChooser

 
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
 

-class wxFileDialog: public wxGenericFileDialog
+class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase

 {
 public:
     wxFileDialog() { }
 {
 public:
     wxFileDialog() { }


@@ -31,35 +26,48 @@ public:
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,

-                 long style = 0,
-                 const wxPoint& pos = wxDefaultPosition);
-                 
-    ~wxFileDialog();
-    
+                 long style = wxFD_DEFAULT_STYLE,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr);
+    virtual ~wxFileDialog();
+
+    virtual wxString GetPath() const;

     virtual void GetPaths(wxArrayString& paths) const;
     virtual void GetPaths(wxArrayString& paths) const;

+    virtual wxString GetDirectory() const;
+    virtual wxString GetFilename() const;

     virtual void GetFilenames(wxArrayString& files) const;
     virtual void GetFilenames(wxArrayString& files) const;

-    
+    virtual int GetFilterIndex() const;
+

     virtual void SetMessage(const wxString& message);
     virtual void SetPath(const wxString& path);
     virtual void SetDirectory(const wxString& dir);
     virtual void SetFilename(const wxString& name);
     virtual void SetWildcard(const wxString& wildCard);
     virtual void SetFilterIndex(int filterIndex);
     virtual void SetMessage(const wxString& message);
     virtual void SetPath(const wxString& path);
     virtual void SetDirectory(const wxString& dir);
     virtual void SetFilename(const wxString& name);
     virtual void SetWildcard(const wxString& wildCard);
     virtual void SetFilterIndex(int filterIndex);

-            
+

     virtual int ShowModal();
     virtual int ShowModal();

-    virtual bool Show( bool show = true );

 
 

+    virtual bool SupportsExtraControl() const { return true; }
+
+
+protected:
+    // override this from wxTLW since the native
+    // form doesn't have any m_wxwindow
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
+
+private:

     void OnFakeOk( wxCommandEvent &event );
     void OnFakeOk( wxCommandEvent &event );

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

 
 

-//private:
-    bool m_destroyed_by_delete;
-    
-    void UpdateFromDialog();
-    void UpdateDialog();
+    wxGtkFileChooser    m_fc;

 
 

-private:    

     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()
 };
 

-#endif // __GTKFILEDLGH__
+#endif // _WX_GTKFILEDLG_H_