corrected WX_DEFINE_VARARG_FUNC_NOP usage

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

diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index 70e26820cf6356f2c9ff7714a4f79751b2ba55f3..5a2537e8735b196b5b2d9e6a9f4050c63ae74e4b 100644 (file)
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filedlg.h
+// Name:        wx/gtk1/filedlg.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,19 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKFILEDLGH__
 #define __GTKFILEDLGH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
+#include "wx/generic/filedlgg.h"
 
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
 
-class wxFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog
 {
 public:
     wxFileDialog() { }
@@ -29,14 +26,20 @@ public:
                  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 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);
@@ -44,11 +47,23 @@ public:
     virtual void SetWildcard(const wxString& wildCard);
     virtual void SetFilterIndex(int filterIndex);
 
-    void UpdateFromDialog();
+    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:
-    void UpdateDialog();
-    
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    DECLARE_EVENT_TABLE()
+    void OnFakeOk( wxCommandEvent &event );
 };
 
 #endif // __GTKFILEDLGH__