X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c81c9392fa0856ea150722ab3dfda296382be523..c4fa282ce14a102c5e55aaaec74b7d3b0a605baf:/src/generic/filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index e54b8b9e11..6ca8f2ade2 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -297,7 +297,7 @@ void wxFileData::ReadData()
                          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"),
@@ -999,7 +999,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
 
     if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
                            wxDEFAULT_DIALOG_STYLE
-#ifndef __WXWINCE__
+#if !(defined(__PDA__) || defined(__SMARTPHONE__))
                            | wxRESIZE_BORDER
 #endif
                            ))
@@ -1296,9 +1296,7 @@ void wxGenericFileDialog::OnActivated( wxListEvent &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) )
@@ -1358,8 +1356,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
     if (filename.empty())
     {
 #ifdef __WXWINCE__
-        wxCommandEvent event;
-        wxDialog::OnCancel(event);
+        EndModal(wxID_CANCEL);
 #endif
         return;
     }
@@ -1482,8 +1479,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
         }
     }
 
-    wxCommandEvent event;
-    wxDialog::OnOK(event);
+    EndModal(wxID_OK);
 }
 
 void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )