cleanup - remove duplicate decl., added #include, etc.

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

diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index 308016297d7c3210b4f8f5e337b84bba3deee69d..44a07faa5a210b761ab6b4763331e8f0d7c7eb59 100644 (file)
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -7,19 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKFILEDLGH__
 #define __GTKFILEDLGH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
+#include "wx/generic/filedlgg.h"
 
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
 
-class wxFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog
 {
 public:
     wxFileDialog() { }
@@ -31,11 +28,40 @@ public:
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition);
-    
+
+    virtual ~wxFileDialog();
+
+    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 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 bool Show( bool show = true );
+
+//private:
+    bool m_destroyed_by_delete;
+
+    // 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:
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    DECLARE_EVENT_TABLE()
+    void OnFakeOk( wxCommandEvent &event );
 };
 
 #endif // __GTKFILEDLGH__