Split this out from other changes to keep things sane..

[wxWidgets.git] / include / wx / generic / filedlgg.h

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 80aa37e41bc9da3a7c9d55dcf3349e8bb1b94548..9dacc71243466e9e638716b013601fb76d158752 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "filedlgg.h"
 #endif
 
 #pragma interface "filedlgg.h"
 #endif
 


@@ -49,20 +49,20 @@ public:
 
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
 
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,

-                 const wxString& defaultDir = "",
-                 const wxString& defaultFile = "",
+                 const wxString& defaultDir = _T(""),
+                 const wxString& defaultFile = _T(""),

                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition);
     virtual ~wxFileDialog();
 
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition);
     virtual ~wxFileDialog();
 

-    void SetMessage(const wxString& message) { m_message = message; }
+    void SetMessage(const wxString& message) { SetTitle(message); }

     void SetPath(const wxString& path);
     void SetDirectory(const wxString& dir) { m_dir = dir; }
     void SetFilename(const wxString& name) { m_fileName = name; }
     void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     void SetStyle(long style) { m_dialogStyle = style; }
     void SetPath(const wxString& path);
     void SetDirectory(const wxString& dir) { m_dir = dir; }
     void SetFilename(const wxString& name) { m_fileName = name; }
     void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     void SetStyle(long style) { m_dialogStyle = style; }

-    void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
+    void SetFilterIndex(int filterIndex);

 
     wxString GetMessage() const { return m_message; }
     wxString GetPath() const { return m_path; }
 
     wxString GetMessage() const { return m_message; }
     wxString GetPath() const { return m_path; }


@@ -76,6 +76,11 @@ public:
     void GetPaths(wxArrayString& paths) const;
     void GetFilenames(wxArrayString& files) const;
 
     void GetPaths(wxArrayString& paths) const;
     void GetFilenames(wxArrayString& files) const;
 

+    // implementation only from now on
+    // -------------------------------
+
+    virtual int ShowModal();
+

     void OnSelected( wxListEvent &event );
     void OnActivated( wxListEvent &event );
     void OnList( wxCommandEvent &event );
     void OnSelected( wxListEvent &event );
     void OnActivated( wxListEvent &event );
     void OnList( wxCommandEvent &event );


@@ -84,13 +89,17 @@ public:
     void OnHome( wxCommandEvent &event );
     void OnListOk( wxCommandEvent &event );
     void OnNew( wxCommandEvent &event );
     void OnHome( wxCommandEvent &event );
     void OnListOk( wxCommandEvent &event );
     void OnNew( wxCommandEvent &event );

-    void OnChoice( wxCommandEvent &event );
+    void OnChoiceFilter( wxCommandEvent &event );

     void OnTextEnter( wxCommandEvent &event );
     void OnTextEnter( wxCommandEvent &event );

+    void OnTextChange( wxCommandEvent &event );

     void OnCheck( wxCommandEvent &event );
 
     void HandleAction( const wxString &fn );
 
 protected:
     void OnCheck( wxCommandEvent &event );
 
     void HandleAction( const wxString &fn );
 
 protected:

+    // use the filter with the given index
+    void DoSetFilterIndex(int filterindex);
+

     wxString       m_message;
     long           m_dialogStyle;
     wxString       m_dir;
     wxString       m_message;
     long           m_dialogStyle;
     wxString       m_dir;


@@ -109,8 +118,9 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()
 

-    static long   s_lastViewStyle;  // list or report?
-    static bool   s_lastShowHidden; 
+    // these variables are preserved between wxFileDialog calls
+    static long ms_lastViewStyle;     // list or report?
+    static bool ms_lastShowHidden;    // did we show hidden files?

 };
 
 // File selector - backward compatibility
 };
 
 // File selector - backward compatibility


@@ -154,3 +164,4 @@ wxSaveFileSelector(const wxChar *what,
 #endif
     // _WX_DIRDLGG_H_
 
 #endif
     // _WX_DIRDLGG_H_
 

+