Added wxDataViewBitmapCell

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index e54b8b9e11c78ce62804c73eb5eb182598ef2a60..5264d092859a47727e98f7b4d5a75d91ccdd8fac 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -13,7 +13,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_FILEDLG
 #endif
 
 #if wxUSE_FILEDLG


@@ -23,27 +23,32 @@
 #error wxGenericFileDialog currently only supports Unix, win32 and DOS
 #endif
 
 #error wxGenericFileDialog currently only supports Unix, win32 and DOS
 #endif
 

-#include "wx/checkbox.h"
-#include "wx/textctrl.h"
-#include "wx/choice.h"
-#include "wx/checkbox.h"
-#include "wx/stattext.h"
-#include "wx/debug.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/log.h"
+    #include "wx/msgdlg.h"
+    #include "wx/bmpbuttn.h"
+    #include "wx/checkbox.h"
+    #include "wx/choice.h"
+    #include "wx/stattext.h"
+    #include "wx/textctrl.h"
+    #include "wx/sizer.h"
+    #include "wx/filedlg.h"     // wxFD_OPEN, wxFD_SAVE...
+#endif
+

 #include "wx/longlong.h"
 #include "wx/longlong.h"

-#include "wx/intl.h"
-#include "wx/msgdlg.h"
-#include "wx/sizer.h"
-#include "wx/bmpbuttn.h"

 #include "wx/tokenzr.h"
 #include "wx/config.h"
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"

-#include "wx/settings.h"

 #include "wx/filefn.h"
 #include "wx/file.h"        // for wxS_IXXX constants only
 #include "wx/filefn.h"
 #include "wx/file.h"        // for wxS_IXXX constants only

-#include "wx/filedlg.h"     // wxOPEN, wxSAVE...

 #include "wx/generic/filedlgg.h"
 #include "wx/generic/dirctrlg.h" // for wxFileIconsTable
 
 #include "wx/generic/filedlgg.h"
 #include "wx/generic/dirctrlg.h" // for wxFileIconsTable
 


@@ -52,8 +57,8 @@
 #endif
 
 #ifndef __WXWINCE__
 #endif
 
 #ifndef __WXWINCE__

-#include <sys/types.h>
-#include <sys/stat.h>
+    #include <sys/types.h>
+    #include <sys/stat.h>

 #endif
 
 #ifdef __UNIX__
 #endif
 
 #ifdef __UNIX__


@@ -65,7 +70,6 @@
 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__

-    #include "wx/msw/wrapwin.h"

     #include "wx/msw/mslu.h"
 #endif
 
     #include "wx/msw/mslu.h"
 #endif
 


@@ -297,7 +301,7 @@ void wxFileData::ReadData()
                          buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
                          buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
 #elif defined(__WIN32__)
                          buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
                          buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
 #elif defined(__WIN32__)

-    DWORD attribs = GetFileAttributes(m_filePath.fn_str());
+    DWORD attribs = ::GetFileAttributes(m_filePath.c_str());

     if (attribs != (DWORD)-1)
     {
         m_permissions.Printf(_T("%c%c%c%c"),
     if (attribs != (DWORD)-1)
     {
         m_permissions.Printf(_T("%c%c%c%c"),


@@ -353,7 +357,7 @@ wxString wxFileData::GetHint() const
     else if (IsDrive())
         s += _("<DRIVE>");
     else // plain file
     else if (IsDrive())
         s += _("<DRIVE>");
     else // plain file

-        s += wxString::Format(_("%ld bytes"),
+        s += wxString::Format(wxPLURAL("%ld byte", "%ld bytes", m_size),

                               wxLongLong(m_size).ToString().c_str());
 
     s += wxT(' ');
                               wxLongLong(m_size).ToString().c_str());
 
     s += wxT(' ');


@@ -731,7 +735,7 @@ void wxFileCtrl::GoToParentDir()
 {
     if (!IsTopMostDir(m_dirName))
     {
 {
     if (!IsTopMostDir(m_dirName))
     {

-        size_t len = m_dirName.Len();
+        size_t len = m_dirName.length();

         if (wxEndsWithPathSeparator(m_dirName))
             m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );
         if (wxEndsWithPathSeparator(m_dirName))
             m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );


@@ -819,8 +823,8 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
     wxASSERT( fd );
 
     if ((event.GetLabel().empty()) ||
     wxASSERT( fd );
 
     if ((event.GetLabel().empty()) ||

-        (event.GetLabel() == _(".")) ||
-        (event.GetLabel() == _("..")) ||
+        (event.GetLabel() == wxT(".")) ||
+        (event.GetLabel() == wxT("..")) ||

         (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
     {
         wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
         (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
     {
         wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );


@@ -971,10 +975,12 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                            const wxString& wildCard,
                            long  style,
                            const wxPoint& pos,
                            const wxString& wildCard,
                            long  style,
                            const wxPoint& pos,

+                           const wxSize& sz,
+                           const wxString& name,

                            bool  bypassGenericImpl ) : wxFileDialogBase()
 {
     Init();
                            bool  bypassGenericImpl ) : wxFileDialogBase()
 {
     Init();

-    Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, bypassGenericImpl );
+    Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name, bypassGenericImpl );

 }
 
 bool wxGenericFileDialog::Create( wxWindow *parent,
 }
 
 bool wxGenericFileDialog::Create( wxWindow *parent,


@@ -984,12 +990,14 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
                                   const wxString& wildCard,
                                   long  style,
                                   const wxPoint& pos,
                                   const wxString& wildCard,
                                   long  style,
                                   const wxPoint& pos,

+                                  const wxSize& sz,
+                                  const wxString& name,

                                   bool  bypassGenericImpl )
 {
     m_bypassGenericImpl = bypassGenericImpl;
 
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
                                   bool  bypassGenericImpl )
 {
     m_bypassGenericImpl = bypassGenericImpl;
 
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,

-                                  wildCard, style, pos))
+                                  wildCard, style, pos, sz, name))

     {
         return false;
     }
     {
         return false;
     }


@@ -997,11 +1005,8 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
     if (m_bypassGenericImpl)
         return true;
 
     if (m_bypassGenericImpl)
         return true;
 

-    if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
-                           wxDEFAULT_DIALOG_STYLE
-#ifndef __WXWINCE__
-                           | wxRESIZE_BORDER
-#endif
+    if (!wxDialog::Create( parent, wxID_ANY, message, pos, sz,
+                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER, name

                            ))
     {
         return false;
                            ))
     {
         return false;


@@ -1017,11 +1022,6 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
                               &ms_lastShowHidden);
     }
 
                               &ms_lastShowHidden);
     }
 

-    if (m_dialogStyle == 0)
-        m_dialogStyle = wxOPEN;
-    if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
-        m_dialogStyle |= wxOPEN;
-

     if ((m_dir.empty()) || (m_dir == wxT(".")))
     {
         m_dir = wxGetCwd();
     if ((m_dir.empty()) || (m_dir == wxT(".")))
     {
         m_dir = wxGetCwd();


@@ -1029,7 +1029,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
             m_dir = wxFILE_SEP_PATH;
     }
 
             m_dir = wxFILE_SEP_PATH;
     }
 

-    size_t len = m_dir.Len();
+    size_t len = m_dir.length();

     if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))
         m_dir.Remove( len-1, 1 );
 
     if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))
         m_dir.Remove( len-1, 1 );
 


@@ -1102,7 +1102,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
     long style2 = ms_lastViewStyle;
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
     long style2 = ms_lastViewStyle;

-    if ( !(m_dialogStyle & wxMULTIPLE) )
+    if ( !HasFlag(wxFD_MULTIPLE) )

         style2 |= wxLC_SINGLE_SEL;
 
 #ifdef __WXWINCE__
         style2 |= wxLC_SINGLE_SEL;
 
 #ifdef __WXWINCE__


@@ -1122,7 +1122,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );

-        m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+        m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );

         textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
         mainsizer->Add( textsizer, 0, wxEXPAND );
 
         textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
         mainsizer->Add( textsizer, 0, wxEXPAND );
 


@@ -1145,7 +1145,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );

-        m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+        m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );

         textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
         textsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
         mainsizer->Add( textsizer, 0, wxEXPAND );
         textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
         textsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
         mainsizer->Add( textsizer, 0, wxEXPAND );


@@ -1296,9 +1296,7 @@ void wxGenericFileDialog::OnActivated( wxListEvent &event )
 
 void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
 {
 
 void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
 {

-    wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    cevent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( cevent );
+    HandleAction( m_text->GetValue() );

 }
 
 void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
 }
 
 void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )


@@ -1334,13 +1332,21 @@ void wxGenericFileDialog::OnSelected( wxListEvent &event )
     // No double-click on most WinCE devices, so do action immediately.
     HandleAction( filename );
 #else
     // No double-click on most WinCE devices, so do action immediately.
     HandleAction( filename );
 #else

-    if (filename == wxT("..")) return;
+    if (filename == wxT(".."))
+    {
+        inSelected = false;
+        return;
+    }

 
     wxString dir = m_list->GetDir();
     if (!IsTopMostDir(dir))
         dir += wxFILE_SEP_PATH;
     dir += filename;
 
     wxString dir = m_list->GetDir();
     if (!IsTopMostDir(dir))
         dir += wxFILE_SEP_PATH;
     dir += filename;

-    if (wxDirExists(dir)) return;
+    if (wxDirExists(dir))
+    {
+        inSelected = false;
+        return;
+    }

 
     ignoreChanges = true;
     m_text->SetValue( filename );
 
     ignoreChanges = true;
     m_text->SetValue( filename );


@@ -1358,8 +1364,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
     if (filename.empty())
     {
 #ifdef __WXWINCE__
     if (filename.empty())
     {
 #ifdef __WXWINCE__

-        wxCommandEvent event;
-        wxDialog::OnCancel(event);
+        EndModal(wxID_CANCEL);

 #endif
         return;
     }
 #endif
         return;
     }


@@ -1399,7 +1404,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
     }
 #endif // __UNIX__
 
     }
 #endif // __UNIX__
 

-    if (!(m_dialogStyle & wxSAVE))
+    if (!HasFlag(wxFD_SAVE))

     {
         if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
             (filename.Find(wxT('?')) != wxNOT_FOUND))
     {
         if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
             (filename.Find(wxT('?')) != wxNOT_FOUND))


@@ -1444,14 +1449,13 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
     // VZ: the logic of testing for !wxFileExists() only for the open file
     //     dialog is not entirely clear to me, why don't we allow saving to a
     //     file without extension as well?
     // VZ: the logic of testing for !wxFileExists() only for the open file
     //     dialog is not entirely clear to me, why don't we allow saving to a
     //     file without extension as well?

-    if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) )
+    if ( !HasFlag(wxFD_OPEN) || !wxFileExists(filename) )

     {
         filename = AppendExtension(filename, m_filterExtension);
     }
 
     // check that the file [doesn't] exist if necessary
     {
         filename = AppendExtension(filename, m_filterExtension);
     }
 
     // check that the file [doesn't] exist if necessary

-    if ( (m_dialogStyle & wxSAVE) &&
-            (m_dialogStyle & wxOVERWRITE_PROMPT) &&
+    if ( HasFlag(wxFD_SAVE) && HasFlag(wxFD_OVERWRITE_PROMPT) &&

                 wxFileExists( filename ) )
     {
         wxString msg;
                 wxFileExists( filename ) )
     {
         wxString msg;


@@ -1460,8 +1464,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
         if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
             return;
     }
         if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
             return;
     }

-    else if ( (m_dialogStyle & wxOPEN) &&
-                (m_dialogStyle & wxFILE_MUST_EXIST) &&
+    else if ( HasFlag(wxFD_OPEN) && HasFlag(wxFD_FILE_MUST_EXIST) &&

                     !wxFileExists(filename) )
     {
         wxMessageBox(_("Please choose an existing file."), _("Error"),
                     !wxFileExists(filename) )
     {
         wxMessageBox(_("Please choose an existing file."), _("Error"),


@@ -1471,7 +1474,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
     SetPath( filename );
 
     // change to the directory where the user went if asked
     SetPath( filename );
 
     // change to the directory where the user went if asked

-    if ( m_dialogStyle & wxCHANGE_DIR )
+    if ( HasFlag(wxFD_CHANGE_DIR) )

     {
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);
     {
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);


@@ -1482,8 +1485,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
         }
     }
 
         }
     }
 

-    wxCommandEvent event;
-    wxDialog::OnOK(event);
+    EndModal(wxID_OK);

 }
 
 void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
 }
 
 void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )


@@ -1627,10 +1629,10 @@ void wxGenericFileDialog::UpdateControls()
 #endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
 }
 
 #endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
 }
 

-#ifdef USE_GENERIC_FILEDIALOG
+#ifdef wxUSE_GENERIC_FILEDIALOG

 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
 

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

 
 #endif // wxUSE_FILEDLG
 
 #endif // wxUSE_FILEDLG