OS/2 fix

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

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 70e26820cf6356f2c9ff7714a4f79751b2ba55f3..c448dbb3bdefd4fab23fdbb20c0e2c33ddcf8c16 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -12,14 +12,16 @@
 #define __GTKFILEDLGH__
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #define __GTKFILEDLGH__
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

-#pragma interface
+#pragma interface "filedlggtk.h"

 #endif
 
 #endif
 

+#include "wx/generic/filedlgg.h"
+

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

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

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


@@ -31,12 +33,16 @@ public:
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition);
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition);

-                 
-    ~wxFileDialog();
-    
+
+    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 SetMessage(const wxString& message);
     virtual void SetPath(const wxString& path);
     virtual void SetDirectory(const wxString& dir);


@@ -44,11 +50,16 @@ public:
     virtual void SetWildcard(const wxString& wildCard);
     virtual void SetFilterIndex(int filterIndex);
 
     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;
+

 private:
 private:

-    void UpdateDialog();
-    

     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_DYNAMIC_CLASS(wxFileDialog)

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

 };
 
 #endif // __GTKFILEDLGH__
 };
 
 #endif // __GTKFILEDLGH__