wxOS2 build fixes after wxColourBase introduction.

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

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 62f6bf2481d5a7f648703021cc4e58a65727e3b6..bc6ee53637dfafa2c66ceab154944bbeaaf4241b 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -12,12 +12,9 @@
 #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"

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


@@ -45,23 +42,26 @@ 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 = 0,
+                        const wxPoint& pos = wxDefaultPosition,
+                        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,
                  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 ~wxGenericFileDialog();
 
     virtual void SetMessage(const wxString& message) { SetTitle(message); }


@@ -95,7 +95,7 @@ public:
     virtual void HandleAction( const wxString &fn );
 
     virtual void UpdateControls();
     virtual void HandleAction( const wxString &fn );
 
     virtual void UpdateControls();

-    
+

 private:
     // Don't use this implementation at all :-)
     bool m_bypassGenericImpl;
 private:
     // Don't use this implementation at all :-)
     bool m_bypassGenericImpl;


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


@@ -139,7 +140,7 @@ public:
           :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
      {
      }
           :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
      {
      }

-     
+

 private:
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 private:
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };


@@ -162,6 +163,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 +184,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 +226,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();

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


@@ -294,7 +299,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()
 };