[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 22b50f98009285953fc54b8e3968accee0c134aa..b942af6d6e99bffc001495b305568b7d94fa7b23 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxTextCtrl;
 
 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
 
     #define USE_GENERIC_FILEDIALOG
 #endif
 


@@ -45,20 +45,32 @@ class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
 {
 public:
 class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
 {
 public:

-    wxGenericFileDialog() { }
+    wxGenericFileDialog() : wxFileDialogBase() { Init(); }

 
     wxGenericFileDialog(wxWindow *parent,
 
     wxGenericFileDialog(wxWindow *parent,

-                 const wxString& message = wxFileSelectorPromptStr,
+                        const wxString& message = wxFileSelectorPromptStr,

                         const wxString& defaultDir = wxEmptyString,
                         const wxString& defaultFile = wxEmptyString,
                         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 = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,

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

-                 const wxPoint& pos = wxDefaultPosition);
+                 const wxPoint& pos = wxDefaultPosition,
+                 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 ~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;
 
     // for multiple file selection
     virtual void GetPaths(wxArrayString& paths) const;


@@ -68,6 +80,7 @@ public:
     // -------------------------------
 
     virtual int ShowModal();
     // -------------------------------
 
     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 );


@@ -86,6 +99,10 @@ public:
 
     virtual void UpdateControls();
 
 
     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);


@@ -100,6 +117,7 @@ protected:
     wxBitmapButton *m_newDirButton;
 
 private:
     wxBitmapButton *m_newDirButton;
 
 private:

+    void Init();

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


@@ -112,21 +130,22 @@ private:
 
 class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 {
 
 class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 {

-     DECLARE_DYNAMIC_CLASS(wxFileDialog)
-

 public:
      wxFileDialog() {}
 
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
 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)
      {
      }
                  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
 };
 
 #endif // USE_GENERIC_FILEDIALOG


@@ -147,12 +166,16 @@ public:
         is_drive = 0x0008
     };
 
         is_drive = 0x0008
     };
 

+    wxFileData() { Init(); }

     // Full copy constructor
     // 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 );
 
     // 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();
 
     // (re)read the extra data about the file from the system
     void ReadData();
 


@@ -206,7 +229,10 @@ public:
     // initialize a wxListItem attributes
     void MakeItem( wxListItem &item );
 
     // 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;
     wxString m_fileName;
     wxString   m_filePath;
     long     m_size;


@@ -214,6 +240,9 @@ private:
     wxString m_permissions;
     int      m_type;
     int        m_image;
     wxString m_permissions;
     int      m_type;
     int        m_image;

+    
+private:
+    void Init();

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -238,7 +267,7 @@ public:
     virtual void ChangeToListMode();
     virtual void ChangeToReportMode();
     virtual void ChangeToSmallIconMode();
     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 );
     bool GetShowHidden() const { return m_showHidden; }
 
     virtual long Add( wxFileData *fd, wxListItem &item );


@@ -253,6 +282,7 @@ public:
     wxString GetDir() const { return m_dirName; }
 
     void OnListDeleteItem( wxListEvent &event );
     wxString GetDir() const { return m_dirName; }
 
     void OnListDeleteItem( wxListEvent &event );

+    void OnListDeleteAllItems( wxListEvent &event );

     void OnListEndLabelEdit( wxListEvent &event );
     void OnListColClick( wxListEvent &event );
 
     void OnListEndLabelEdit( wxListEvent &event );
     void OnListColClick( wxListEvent &event );
 


@@ -261,7 +291,7 @@ public:
     wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
 
 protected:
     wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
 
 protected:

-    void FreeItemData(const wxListItem& item);
+    void FreeItemData(wxListItem& item);

     void FreeAllItemsData();
 
     wxString      m_dirName;
     void FreeAllItemsData();
 
     wxString      m_dirName;


@@ -272,7 +302,7 @@ protected:
     wxFileData::fileListFieldType m_sort_field;
 
 private:
     wxFileData::fileListFieldType m_sort_field;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxFileCtrl);
+    DECLARE_DYNAMIC_CLASS(wxFileCtrl)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };