fix warnings in EventsSuppressor ctor from gcc with -O option

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

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 665debbe74734b2b0a7381c9cb08956f2ca5ee7b..4c88ab14717a8e44dea5be11f5d771dced366bb3 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -2,92 +2,71 @@
 // Name:        filedlg.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        filedlg.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKFILEDLGH__
 #define __GTKFILEDLGH__
 
 #ifndef __GTKFILEDLGH__
 #define __GTKFILEDLGH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/dialog.h"
+#include "wx/generic/filedlgg.h"
+#include "wx/gtk/filectrl.h"    // for wxGtkFileChooser

 
 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------

-// File selector
+// wxFileDialog

 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------
 

-extern const char *wxFileSelectorPromptStr;
-extern const char *wxFileSelectorDefaultWildcardStr;
-
-class wxFileDialog: public wxDialog
+class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog

 {
 {

-
-  DECLARE_DYNAMIC_CLASS(wxFileDialog)
-  
-  public:
-
-    wxFileDialog() {};
-    
-    wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
-        const wxString& defaultDir = "", const wxString& defaultFile = "", 
-       const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
-        long style = 0, const wxPoint& pos = wxDefaultPosition);
-
-    inline void SetMessage(const wxString& message) { m_message = message; }
-    inline void SetPath(const wxString& path) { m_path = path; }
-    inline void SetDirectory(const wxString& dir) { m_dir = dir; }
-    inline void SetFilename(const wxString& name) { m_fileName = name; }
-    inline void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
-    inline void SetStyle(long style) { m_dialogStyle = style; }
-    inline void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
-
-    inline wxString GetMessage(void) const { return m_message; }
-    inline wxString GetPath(void) const { return m_path; }
-    inline wxString GetDirectory(void) const { return m_dir; }
-    inline wxString GetFilename(void) const { return m_fileName; }
-    inline wxString GetWildcard(void) const { return m_wildCard; }
-    inline long GetStyle(void) const { return m_dialogStyle; }
-    inline int GetFilterIndex(void) const { return m_filterIndex ; }
-
-    int ShowModal(void);
-    
-  protected:
-  
-    wxString    m_message;
-    long        m_dialogStyle;
-    wxWindow *  m_parent;
-    wxString    m_dir;
-    wxString    m_path; // Full path
-    wxString    m_fileName;
-    wxString    m_wildCard;
-    int         m_filterIndex;
+public:
+    wxFileDialog() { }
+
+    wxFileDialog(wxWindow *parent,
+                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
+                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 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);
+    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 );
+
+
+
+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:
+    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    DECLARE_EVENT_TABLE()
+    void OnFakeOk( wxCommandEvent &event );
+
+    wxGtkFileChooser    m_fc;

 };
 
 };
 

-#define wxOPEN 1
-#define wxSAVE 2
-#define wxOVERWRITE_PROMPT 4
-#define wxHIDE_READONLY 8
-
-// File selector - backward compatibility
-
-char* wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
-         const char *default_filename = NULL, const char *default_extension = NULL,
-         const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
-         wxWindow *parent = NULL, int x = -1, int y = -1);
-
-char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, 
-         wxWindow *parent = NULL);
-
-char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, 
-         wxWindow *parent = NULL);
-
-
-
-#endif
-    // __GTKFILEDLGH__
+#endif // __GTKFILEDLGH__