(harmless) VC++ warning fixes

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

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 9dacc71243466e9e638716b013601fb76d158752..62f6bf2481d5a7f648703021cc4e58a65727e3b6 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlgg.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlgg.h

-// Purpose:     wxFileDialog
+// Purpose:     wxGenericFileDialog

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


@@ -12,74 +12,72 @@
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 

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

 #pragma interface "filedlgg.h"
 #endif
 
 #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"

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

-class wxCheckBox;
-class wxChoice;
-class wxFileData;
-class wxFileCtrl;
-class wxFileDialog;
-class wxListEvent;
-class wxStaticText;
-class wxTextCtrl;
+class WXDLLEXPORT wxBitmapButton;
+class WXDLLEXPORT wxCheckBox;
+class WXDLLEXPORT wxChoice;
+class WXDLLEXPORT wxFileData;
+class WXDLLEXPORT wxFileCtrl;
+class WXDLLEXPORT wxGenericFileDialog;
+class WXDLLEXPORT wxListEvent;
+class WXDLLEXPORT wxListItem;
+class WXDLLEXPORT wxStaticText;
+class WXDLLEXPORT wxTextCtrl;
+
+#if defined(__WXUNIVERSAL__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__)
+    #define USE_GENERIC_FILEDIALOG
+#endif

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

-// File selector
+// wxGenericFileDialog

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

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

 {
 public:
 {
 public:

-    wxFileDialog() { }
+    wxGenericFileDialog() { }

 
 

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

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

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

                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,

-                 const wxPoint& pos = wxDefaultPosition);
-    virtual ~wxFileDialog();
-
-    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 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; }
+                 const wxPoint& pos = wxDefaultPosition );
+    virtual ~wxGenericFileDialog();
+
+    virtual void SetMessage(const wxString& message) { SetTitle(message); }
+    virtual void SetPath(const wxString& path);
+    virtual void SetFilterIndex(int filterIndex);
+    virtual void SetWildcard(const wxString& wildCard);

 
     // for multiple file selection
 
     // for multiple file selection

-    void GetPaths(wxArrayString& paths) const;
-    void GetFilenames(wxArrayString& files) const;
+    virtual void GetPaths(wxArrayString& paths) const;
+    virtual void GetFilenames(wxArrayString& files) const;

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

+    virtual bool Show( bool show = true );

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


@@ -94,74 +92,211 @@ public:
     void OnTextChange( wxCommandEvent &event );
     void OnCheck( wxCommandEvent &event );
 
     void OnTextChange( wxCommandEvent &event );
     void OnCheck( wxCommandEvent &event );
 

-    void HandleAction( const wxString &fn );
+    virtual void HandleAction( const wxString &fn );
+
+    virtual void UpdateControls();
+    
+private:
+    // Don't use this implementation at all :-)
+    bool m_bypassGenericImpl;

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

-    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;
     wxString       m_filterExtension;
     wxChoice      *m_choice;
     wxTextCtrl    *m_text;
     wxFileCtrl    *m_list;
     wxCheckBox    *m_check;
     wxStaticText  *m_static;

+    wxBitmapButton *m_upDirButton;
+    wxBitmapButton *m_newDirButton;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)

     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()
 

-    // these variables are preserved between wxFileDialog calls
+    // these variables are preserved between wxGenericFileDialog calls

     static long ms_lastViewStyle;     // list or report?
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 
     static long ms_lastViewStyle;     // list or report?
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 

-// 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);
+#ifdef USE_GENERIC_FILEDIALOG

 
 

+class WXDLLEXPORT 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)
+          :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
+     {
+     }
+     
+private:
+     DECLARE_DYNAMIC_CLASS(wxFileDialog)
+};

 
 

-#endif
-    // _WX_DIRDLGG_H_
+#endif // USE_GENERIC_FILEDIALOG
+
+//-----------------------------------------------------------------------------
+//  wxFileData - a class to hold the file info for the wxFileCtrl
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFileData
+{
+public:
+    enum fileType
+    {
+        is_file  = 0x0000,
+        is_dir   = 0x0001,
+        is_link  = 0x0002,
+        is_exe   = 0x0004,
+        is_drive = 0x0008
+    };
+
+    // Full copy constructor
+    wxFileData( const wxFileData& fileData ) { Copy(fileData); }
+    // Create a filedata from this information
+    wxFileData( const wxString &filePath, const wxString &fileName,
+                fileType type, int image_id );
+
+    // make a full copy of the other wxFileData
+    void Copy( const wxFileData &other );
+
+    // (re)read the extra data about the file from the system
+    void ReadData();
+
+    // get the name of the file, dir, drive
+    wxString GetFileName() const { return m_fileName; }
+    // get the full path + name of the file, dir, path
+    wxString GetFilePath() const { return m_filePath; }
+    // Set the path + name and name of the item
+    void SetNewName( const wxString &filePath, const wxString &fileName );
+
+    // Get the size of the file in bytes
+    long GetSize() const { return m_size; }
+    // Get the type of file, either file extension or <DIR>, <LINK>, <DRIVE>
+    wxString GetFileType() const;
+    // get the last modification time
+    wxDateTime GetDateTime() const { return m_dateTime; }
+    // Get the time as a formatted string
+    wxString GetModificationTime() const;
+    // in UNIX get rwx for file, in MSW get attributes ARHS
+    wxString GetPermissions() const { return m_permissions; }
+    // Get the id of the image used in a wxImageList
+    int GetImageId() const { return m_image; }
+
+    bool IsFile() const  { return !IsDir() && !IsLink() && !IsDrive(); }
+    bool IsDir() const   { return (m_type & is_dir  ) != 0; }
+    bool IsLink() const  { return (m_type & is_link ) != 0; }
+    bool IsExe() const   { return (m_type & is_exe  ) != 0; }
+    bool IsDrive() const { return (m_type & is_drive) != 0; }
+
+    // Get/Set the type of file, file/dir/drive/link
+    int GetType() const { return m_type; }
+
+    // the wxFileCtrl fields in report view
+    enum fileListFieldType
+    {
+        FileList_Name,
+        FileList_Size,
+        FileList_Type,
+        FileList_Time,
+#if defined(__UNIX__) || defined(__WIN32__)
+        FileList_Perm,
+#endif // defined(__UNIX__) || defined(__WIN32__)
+        FileList_Max
+    };
+
+    // Get the entry for report view of wxFileCtrl
+    wxString GetEntry( fileListFieldType num ) const;
+
+    // Get a string representation of the file info
+    wxString GetHint() const;
+    // initialize a wxListItem attributes
+    void MakeItem( wxListItem &item );
+
+
+    wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; }
+
+private:
+    wxString m_fileName;
+    wxString   m_filePath;
+    long     m_size;
+    wxDateTime m_dateTime;
+    wxString m_permissions;
+    int      m_type;
+    int        m_image;
+};
+
+//-----------------------------------------------------------------------------
+//  wxFileCtrl
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFileCtrl : public wxListCtrl
+{
+public:
+    wxFileCtrl();
+    wxFileCtrl( wxWindow *win,
+                wxWindowID id,
+                const wxString &wild,
+                bool showHidden,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = wxLC_LIST,
+                const wxValidator &validator = wxDefaultValidator,
+                const wxString &name = wxT("filelist") );
+    virtual ~wxFileCtrl();
+
+    virtual void ChangeToListMode();
+    virtual void ChangeToReportMode();
+    virtual void ChangeToSmallIconMode();
+    virtual void ShowHidden( bool show = true );
+    bool GetShowHidden() const { return m_showHidden; }
+
+    virtual long Add( wxFileData *fd, wxListItem &item );
+    virtual void UpdateItem(const wxListItem &item);
+    virtual void UpdateFiles();
+    virtual void MakeDir();
+    virtual void GoToParentDir();
+    virtual void GoToHomeDir();
+    virtual void GoToDir( const wxString &dir );
+    virtual void SetWild( const wxString &wild );
+    wxString GetWild() const { return m_wild; }
+    wxString GetDir() const { return m_dirName; }
+
+    void OnListDeleteItem( wxListEvent &event );
+    void OnListDeleteAllItems( wxListEvent &event );
+    void OnListEndLabelEdit( wxListEvent &event );
+    void OnListColClick( wxListEvent &event );
+
+    virtual void SortItems(wxFileData::fileListFieldType field, bool foward);
+    bool GetSortDirection() const { return m_sort_foward; }
+    wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
+
+protected:
+    void FreeItemData(wxListItem& item);
+    void FreeAllItemsData();
+
+    wxString      m_dirName;
+    bool          m_showHidden;
+    wxString      m_wild;
+
+    bool m_sort_foward;
+    wxFileData::fileListFieldType m_sort_field;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFileCtrl);
+    DECLARE_EVENT_TABLE()
+};

 
 

+#endif // _WX_FILEDLGG_H_