Fixed various NULL reference issues. Also cleaned up wxPGComboBox code overall a...

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

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index bc6ee53637dfafa2c66ceab154944bbeaaf4241b..e27901cee50b51d05a8383c7249b62258b022e3b 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlgg.h
+// Name:        wx/generic/filedlgg.h

 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling
 // Modified by:


@@ -15,31 +15,24 @@
 #include "wx/listctrl.h"
 #include "wx/datetime.h"
 #include "wx/filefn.h"
 #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 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
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxGenericFileCtrl;
+class WXDLLIMPEXP_FWD_CORE wxGenericFileDialog;
+class WXDLLIMPEXP_FWD_CORE wxFileCtrlEvent;

 
 //-------------------------------------------------------------------------
 // wxGenericFileDialog
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // wxGenericFileDialog
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxGenericFileDialog: public wxFileDialogBase

 {
 public:
     wxGenericFileDialog() : wxFileDialogBase() { Init(); }
 {
 public:
     wxGenericFileDialog() : wxFileDialogBase() { Init(); }


@@ -49,8 +42,10 @@ public:
                         const wxString& defaultDir = wxEmptyString,
                         const wxString& defaultFile = wxEmptyString,
                         const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                         const wxString& defaultDir = wxEmptyString,
                         const wxString& defaultFile = wxEmptyString,
                         const wxString& wildCard = wxFileSelectorDefaultWildcardStr,

-                        long style = 0,
+                        long style = wxFD_DEFAULT_STYLE,

                         const wxPoint& pos = wxDefaultPosition,
                         const wxPoint& pos = wxDefaultPosition,

+                        const wxSize& sz = wxDefaultSize,
+                        const wxString& name = wxFileDialogNameStr,

                         bool bypassGenericImpl = false );
 
     bool Create( wxWindow *parent,
                         bool bypassGenericImpl = false );
 
     bool Create( wxWindow *parent,


@@ -58,20 +53,37 @@ public:
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,

-                 long style = 0,
+                 long style = wxFD_DEFAULT_STYLE,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxPoint& pos = wxDefaultPosition,

+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr,

                  bool bypassGenericImpl = false );
 
     virtual ~wxGenericFileDialog();
 
     virtual void SetMessage(const wxString& message) { SetTitle(message); }
                  bool bypassGenericImpl = false );
 
     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
-    virtual void GetPaths(wxArrayString& paths) const;
-    virtual void GetFilenames(wxArrayString& files) const;
+    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
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -79,42 +91,33 @@ public:
     virtual int ShowModal();
     virtual bool Show( bool show = true );
 
     virtual int ShowModal();
     virtual bool Show( bool show = true );
 

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

     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 OnChoiceFilter( wxCommandEvent &event );
-    void OnTextEnter( wxCommandEvent &event );
-    void OnTextChange( wxCommandEvent &event );
-    void OnCheck( wxCommandEvent &event );
-
-    virtual void HandleAction( const wxString &fn );
-
-    virtual void UpdateControls();
+    void OnFileActivated( wxFileCtrlEvent &event);

 
 private:
 
 private:

-    // Don't use this implementation at all :-)
+    // if true, don't use this implementation at all

     bool m_bypassGenericImpl;
 
 protected:
     bool m_bypassGenericImpl;
 
 protected:

-    // use the filter with the given index
-    void DoSetFilterIndex(int filterindex);
+    // update the state of m_upDirButton and m_newDirButton depending on the
+    // currently selected directory
+    void OnUpdateButtonsUI(wxUpdateUIEvent& event);

 
 

-    wxString       m_filterExtension;
-    wxChoice      *m_choice;
-    wxTextCtrl    *m_text;
-    wxFileCtrl    *m_list;
-    wxCheckBox    *m_check;
-    wxStaticText  *m_static;
-    wxBitmapButton *m_upDirButton;
-    wxBitmapButton *m_newDirButton;
+    wxString               m_filterExtension;
+    wxGenericFileCtrl     *m_filectrl;
+    wxBitmapButton        *m_upDirButton;
+    wxBitmapButton        *m_newDirButton;

 
 private:
     void Init();
 
 private:
     void Init();

+    wxBitmapButton* AddBitmapButton( wxWindowID winId, const wxArtID& artId,
+                                     const wxString& tip, wxSizer *sizer );
+

     DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)
     DECLARE_EVENT_TABLE()
 


@@ -123,9 +126,9 @@ private:
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 

-#ifdef USE_GENERIC_FILEDIALOG
+#ifdef wxHAS_GENERIC_FILEDIALOG

 
 

-class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
+class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog

 {
 public:
      wxFileDialog() {}
 {
 public:
      wxFileDialog() {}


@@ -145,163 +148,6 @@ private:
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 

-#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
-    };
-
-    wxFileData() { Init(); }
-    // 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
-    wxFileOffset 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 );
-
-    // operators
-    wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; }
-
-protected:
-    wxString m_fileName;
-    wxString   m_filePath;
-    wxFileOffset m_size;
-    wxDateTime m_dateTime;
-    wxString m_permissions;
-    int      m_type;
-    int      m_image;
-
-private:
-    void Init();
-};
-
-//-----------------------------------------------------------------------------
-//  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 // wxHAS_GENERIC_FILEDIALOG

 
 #endif // _WX_FILEDLGG_H_
 
 #endif // _WX_FILEDLGG_H_

-