Separate includes needed for Darwin and classic [ followup on Patch 1160346 ]

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

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 70e26820cf6356f2c9ff7714a4f79751b2ba55f3..43dc8f418e3469f1eae85baba3210da120cb0563 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() { }


@@ -43,12 +45,21 @@ public:
     virtual void SetFilename(const wxString& name);
     virtual void SetWildcard(const wxString& wildCard);
     virtual void SetFilterIndex(int filterIndex);
     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 );
+
+    void OnFakeOk( wxCommandEvent &event );

 
 

+//private:
+    bool m_destroyed_by_delete;
+    

     void UpdateFromDialog();
     void UpdateFromDialog();

-private:

     void UpdateDialog();
     void UpdateDialog();

-    
+
+private:    

     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_DYNAMIC_CLASS(wxFileDialog)

+    DECLARE_EVENT_TABLE()

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