ignore warning 4535 for VC8 too as it still seems to be harmless

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

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 489beb5d1b140ebf46941e32eb2d55a6b29f767e..f103a39c25164b5a00bcb289980eb26c39ac628a 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:


@@ -12,12 +12,10 @@
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 
 #ifndef _WX_FILEDLGG_H_
 #define _WX_FILEDLGG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "filedlgg.h"
-#endif
-

 #include "wx/listctrl.h"
 #include "wx/datetime.h"
 #include "wx/listctrl.h"
 #include "wx/datetime.h"

+#include "wx/filefn.h"
+#include "wx/filedlg.h"

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


@@ -34,10 +32,6 @@ class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxTextCtrl;
 
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxTextCtrl;
 

-#if defined(__WXUNIVERSAL__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__)
-    #define USE_GENERIC_FILEDIALOG
-#endif
-

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


@@ -45,23 +39,30 @@ 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 );
+                        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,
     bool Create( wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,

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

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

-                 long style = 0,
-                 const wxPoint& pos = wxDefaultPosition );
+                 long style = wxFD_DEFAULT_STYLE,
+                 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); }
     virtual ~wxGenericFileDialog();
 
     virtual void SetMessage(const wxString& message) { SetTitle(message); }


@@ -114,6 +115,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()
 


@@ -122,7 +124,7 @@ private:
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 

-#ifdef USE_GENERIC_FILEDIALOG
+#ifdef wxUSE_GENERIC_FILEDIALOG

 
 class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 {
 
 class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 {


@@ -144,7 +146,7 @@ private:
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 

-#endif // USE_GENERIC_FILEDIALOG
+#endif // wxUSE_GENERIC_FILEDIALOG

 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileCtrl
 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileCtrl


@@ -162,6 +164,7 @@ public:
         is_drive = 0x0008
     };
 
         is_drive = 0x0008
     };
 

+    wxFileData() { Init(); }

     // Full copy constructor
     wxFileData( const wxFileData& fileData ) { Copy(fileData); }
     // Create a filedata from this information
     // Full copy constructor
     wxFileData( const wxFileData& fileData ) { Copy(fileData); }
     // Create a filedata from this information


@@ -182,7 +185,7 @@ public:
     void SetNewName( const wxString &filePath, const wxString &fileName );
 
     // Get the size of the file in bytes
     void SetNewName( const wxString &filePath, const wxString &fileName );
 
     // Get the size of the file in bytes

-    long GetSize() const { return m_size; }
+    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
     // Get the type of file, either file extension or <DIR>, <LINK>, <DRIVE>
     wxString GetFileType() const;
     // get the last modification time


@@ -224,17 +227,20 @@ public:
     // initialize a wxListItem attributes
     void MakeItem( wxListItem &item );
 
     // initialize a wxListItem attributes
     void MakeItem( wxListItem &item );
 

-
+    // operators

     wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; }
 
     wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; }
 

-private:
+protected:

     wxString m_fileName;
     wxString   m_filePath;
     wxString m_fileName;
     wxString   m_filePath;

-    long     m_size;
+    wxFileOffset m_size;

     wxDateTime m_dateTime;
     wxString m_permissions;
     int      m_type;
     wxDateTime m_dateTime;
     wxString m_permissions;
     int      m_type;

-    int        m_image;
+    int      m_image;
+
+private:
+    void Init();

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


@@ -299,4 +305,3 @@ private:
 };
 
 #endif // _WX_FILEDLGG_H_
 };
 
 #endif // _WX_FILEDLGG_H_

-