[1231183] 'cleanup: mismatched indentation' and other cleanings.

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

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index b6157b4d56ede752d479d16dbf447c58083fa957..b942af6d6e99bffc001495b305568b7d94fa7b23 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -12,11 +12,10 @@
 #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
 
-#include "wx/dialog.h"
 #include "wx/listctrl.h"
 #include "wx/datetime.h"
 
@@ -35,7 +34,7 @@ class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxTextCtrl;
 
-#if defined(__WXUNIVERSAL__)||defined(__WXGTK__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__)
+#if defined(__WXUNIVERSAL__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__)
     #define USE_GENERIC_FILEDIALOG
 #endif
 
@@ -43,44 +42,45 @@ class WXDLLEXPORT wxTextCtrl;
 // wxGenericFileDialog
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGenericFileDialog: public wxDialog
+class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
 {
 public:
-    wxGenericFileDialog() { }
+    wxGenericFileDialog() : wxFileDialogBase() { Init(); }
 
     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& defaultDir = _T(""),
-                 const wxString& defaultFile = _T(""),
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
-                 const wxPoint& pos = wxDefaultPosition);
+                 const wxPoint& pos = wxDefaultPosition,
+                 bool bypassGenericImpl = false );
+
     virtual ~wxGenericFileDialog();
 
-    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; }
+    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
-    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();
+    virtual bool Show( bool show = true );
 
     void OnSelected( wxListEvent &event );
     void OnActivated( wxListEvent &event );
@@ -99,17 +99,14 @@ public:
 
     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);
 
-    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;
@@ -120,6 +117,7 @@ protected:
     wxBitmapButton *m_newDirButton;
 
 private:
+    void Init();
     DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)
     DECLARE_EVENT_TABLE()
 
@@ -132,21 +130,22 @@ private:
 
 class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 {
-     DECLARE_DYNAMIC_CLASS(wxFileDialog)
-
 public:
      wxFileDialog() {}
 
     wxFileDialog(wxWindow *parent,
                  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 wxPoint& pos = wxDefaultPosition)
           :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
      {
      }
+
+private:
+     DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 
 #endif // USE_GENERIC_FILEDIALOG
@@ -167,12 +166,16 @@ public:
         is_drive = 0x0008
     };
 
+    wxFileData() { Init(); }
     // Full copy constructor
-    wxFileData( const wxFileData& fileData );
+    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();
 
@@ -226,7 +229,10 @@ public:
     // initialize a wxListItem attributes
     void MakeItem( wxListItem &item );
 
-private:
+    // operators
+    wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; }
+
+protected:
     wxString m_fileName;
     wxString   m_filePath;
     long     m_size;
@@ -234,6 +240,9 @@ private:
     wxString m_permissions;
     int      m_type;
     int        m_image;
+    
+private:
+    void Init();
 };
 
 //-----------------------------------------------------------------------------
@@ -258,7 +267,7 @@ public:
     virtual void ChangeToListMode();
     virtual void ChangeToReportMode();
     virtual void ChangeToSmallIconMode();
-    virtual void ShowHidden( bool show = TRUE );
+    virtual void ShowHidden( bool show = true );
     bool GetShowHidden() const { return m_showHidden; }
 
     virtual long Add( wxFileData *fd, wxListItem &item );
@@ -273,6 +282,7 @@ public:
     wxString GetDir() const { return m_dirName; }
 
     void OnListDeleteItem( wxListEvent &event );
+    void OnListDeleteAllItems( wxListEvent &event );
     void OnListEndLabelEdit( wxListEvent &event );
     void OnListColClick( wxListEvent &event );
 
@@ -281,7 +291,7 @@ public:
     wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
 
 protected:
-    void FreeItemData(const wxListItem& item);
+    void FreeItemData(wxListItem& item);
     void FreeAllItemsData();
 
     wxString      m_dirName;
@@ -292,7 +302,7 @@ protected:
     wxFileData::fileListFieldType m_sort_field;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFileCtrl);
+    DECLARE_DYNAMIC_CLASS(wxFileCtrl)
     DECLARE_EVENT_TABLE()
 };