Generate code using IsOk() instead of Ok() in stc.cpp.

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

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index f08532241185d97d3edef11e55bacdd5830e662c..b4f35b3afd52cdff93c80653da06b8e4221f7d57 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlgg.h
-// Purpose:     wxFileDialog
+// Name:        wx/generic/filedlgg.h
+// Purpose:     wxGenericFileDialog

 // Author:      Robert Roebling
 // Modified by:
 // Created:     8/17/99
 // Author:      Robert Roebling
 // Modified by:
 // Created:     8/17/99


@@ -12,145 +12,150 @@
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "filedlgg.h"
-#endif
-
-#include "wx/dialog.h"
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(extern const wxChar *)wxFileSelectorPromptStr;
-WXDLLEXPORT_DATA(extern const wxChar *)wxFileSelectorDefaultWildcardStr;
+#include "wx/listctrl.h"
+#include "wx/datetime.h"
+#include "wx/filefn.h"
+#include "wx/artprov.h"
+#include "wx/filedlg.h"
+#include "wx/generic/filectrlg.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxCheckBox;
-class wxChoice;
-class wxFileData;
-class wxFileCtrl;
-class wxFileDialog;
-class wxListEvent;
-class wxStaticText;
-class wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxGenericFileCtrl;
+class WXDLLIMPEXP_FWD_CORE wxGenericFileDialog;
+class WXDLLIMPEXP_FWD_CORE wxFileCtrlEvent;

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

-// File selector
+// wxGenericFileDialog

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

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

 {
 public:
 {
 public:

-    wxFileDialog() { }
-
-    wxFileDialog(wxWindow *parent,
+    wxGenericFileDialog() : wxFileDialogBase() { Init(); }
+
+    wxGenericFileDialog(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,
+                        bool bypassGenericImpl = false );
+
+    bool Create( wxWindow *parent,

                  const wxString& message = wxFileSelectorPromptStr,
                  const wxString& message = wxFileSelectorPromptStr,

-                 const wxString& defaultDir = "",
-                 const wxString& defaultFile = "",
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,

                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,

-                 long style = 0,
-                 const wxPoint& pos = wxDefaultPosition);
-    virtual ~wxFileDialog();
-
-    void SetMessage(const wxString& message) { m_message = 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 SetFilterIndex(int filterIndex);
-
-    wxString GetMessage() const { return m_message; }
-    wxString GetPath() const { return m_path; }
-    wxString GetDirectory() const { return m_dir; }
-    wxString GetFilename() const { return m_fileName; }
-    wxString GetWildcard() const { return m_wildCard; }
-    long GetStyle() const { return m_dialogStyle; }
-    int GetFilterIndex() const { return m_filterIndex; }
-
-    // for multiple file selection
-    void GetPaths(wxArrayString& paths) const;
-    void GetFilenames(wxArrayString& files) const;
-
-    void OnSelected( wxListEvent &event );
-    void OnActivated( wxListEvent &event );
+                 long style = wxFD_DEFAULT_STYLE,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr,
+                 bool bypassGenericImpl = false );
+
+    virtual ~wxGenericFileDialog();
+
+    virtual void SetDirectory(const wxString& dir)
+        { m_filectrl->SetDirectory(dir); }
+    virtual void SetFilename(const wxString& name)
+        { m_filectrl->SetFilename(name); }
+    virtual void SetMessage(const wxString& message) { SetTitle(message); }
+    virtual void SetPath(const wxString& path)
+        { m_filectrl->SetPath(path); }
+    virtual void SetFilterIndex(int filterIndex)
+        { m_filectrl->SetFilterIndex(filterIndex); }
+    virtual void SetWildcard(const wxString& wildCard)
+        { m_filectrl->SetWildcard(wildCard); }
+
+    virtual wxString GetPath() const
+        { return m_filectrl->GetPath(); }
+    virtual void GetPaths(wxArrayString& paths) const
+        { m_filectrl->GetPaths(paths); }
+    virtual wxString GetDirectory() const
+        { return m_filectrl->GetDirectory(); }
+    virtual wxString GetFilename() const
+        { return m_filectrl->GetFilename(); }
+    virtual void GetFilenames(wxArrayString& files) const
+        { m_filectrl->GetFilenames(files); }
+    virtual wxString GetWildcard() const
+        { return m_filectrl->GetWildcard(); }
+    virtual int GetFilterIndex() const
+        { return m_filectrl->GetFilterIndex(); }
+    virtual bool SupportsExtraControl() const { return true; }
+
+    // implementation only from now on
+    // -------------------------------
+
+    virtual int ShowModal();
+    virtual bool Show( bool show = true );
+

     void OnList( wxCommandEvent &event );
     void OnReport( wxCommandEvent &event );
     void OnUp( wxCommandEvent &event );
     void OnHome( wxCommandEvent &event );
     void OnList( wxCommandEvent &event );
     void OnReport( wxCommandEvent &event );
     void OnUp( wxCommandEvent &event );
     void OnHome( wxCommandEvent &event );

-    void OnListOk( wxCommandEvent &event );
+    void OnOk( wxCommandEvent &event );

     void OnNew( wxCommandEvent &event );
     void OnNew( wxCommandEvent &event );

-    void OnChoice( wxCommandEvent &event );
-    void OnTextEnter( wxCommandEvent &event );
-    void OnCheck( wxCommandEvent &event );
+    void OnFileActivated( wxFileCtrlEvent &event);

 
 

-    void HandleAction( const wxString &fn );
+private:
+    // if true, don't use this implementation at all
+    bool m_bypassGenericImpl;

 
 protected:
 
 protected:

-    wxString       m_message;
-    long           m_dialogStyle;
-    wxString       m_dir;
-    wxString       m_path; // Full path
-    wxString       m_fileName;
-    wxString       m_wildCard;
-    int            m_filterIndex;
-    wxString       m_filterExtension;
-    wxChoice      *m_choice;
-    wxTextCtrl    *m_text;
-    wxFileCtrl    *m_list;
-    wxCheckBox    *m_check;
-    wxStaticText  *m_static;
+    // update the state of m_upDirButton and m_newDirButton depending on the
+    // currently selected directory
+    void OnUpdateButtonsUI(wxUpdateUIEvent& event);
+
+    wxString               m_filterExtension;
+    wxGenericFileCtrl     *m_filectrl;
+    wxBitmapButton        *m_upDirButton;
+    wxBitmapButton        *m_newDirButton;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    void Init();
+    wxBitmapButton* AddBitmapButton( wxWindowID winId, const wxArtID& artId,
+                                     const wxString& tip, wxSizer *sizer );
+
+    DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)

     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()
 

-    static long   s_lastViewStyle;  // list or report?
-    static bool   s_lastShowHidden; 
+    // these variables are preserved between wxGenericFileDialog calls
+    static long ms_lastViewStyle;     // list or report?
+    static bool ms_lastShowHidden;    // did we show hidden files?
+};
+
+#ifdef wxHAS_GENERIC_FILEDIALOG
+
+class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog
+{
+public:
+    wxFileDialog() {}
+
+    wxFileDialog(wxWindow *parent,
+                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
+                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 long style = 0,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize)
+          :wxGenericFileDialog(parent, message,
+                               defaultDir, defaultFile, wildCard,
+                               style,
+                               pos, size)
+     {
+     }
+
+private:
+     DECLARE_DYNAMIC_CLASS(wxFileDialog)

 };
 
 };
 

-// File selector - backward compatibility
-WXDLLEXPORT wxString
-wxFileSelector(const wxChar *message = wxFileSelectorPromptStr,
-               const wxChar *default_path = NULL,
-               const wxChar *default_filename = NULL,
-               const wxChar *default_extension = NULL,
-               const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
-               int flags = 0,
-               wxWindow *parent = NULL,
-               int x = -1, int y = -1);
-
-// An extended version of wxFileSelector
-WXDLLEXPORT wxString
-wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr,
-                 const wxChar *default_path = NULL,
-                 const wxChar *default_filename = NULL,
-                 int *indexDefaultExtension = NULL,
-                 const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
-                 int flags = 0,
-                 wxWindow *parent = NULL,
-                 int x = -1, int y = -1);
-
-// Ask for filename to load
-WXDLLEXPORT wxString
-wxLoadFileSelector(const wxChar *what,
-                   const wxChar *extension,
-                   const wxChar *default_name = (const wxChar *)NULL,
-                   wxWindow *parent = (wxWindow *) NULL);
-
-// Ask for filename to save
-WXDLLEXPORT wxString
-wxSaveFileSelector(const wxChar *what,
-                   const wxChar *extension,
-                   const wxChar *default_name = (const wxChar *) NULL,
-                   wxWindow *parent = (wxWindow *) NULL);
-
-
-
-#endif
-    // _WX_DIRDLGG_H_
+#endif // wxHAS_GENERIC_FILEDIALOG

 
 

+#endif // _WX_FILEDLGG_H_