X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..99cc862c0fd5fb21152854075808cf82a3a2025d:/src/msw/wince/filedlgwce.cpp

diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp
index 8422c3f016..6d0cfe94cf 100644
--- a/src/msw/wince/filedlgwce.cpp
+++ b/src/msw/wince/filedlgwce.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/wince/filedlgwce.cpp
-// Purpose:     wxFileDialog for WinCE (SmartPhone)
+// Purpose:     wxFileDialog implementation for smart phones driven by WinCE
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "filedlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -31,7 +27,7 @@
 // Only use this for MS SmartPhone. Use standard file dialog
 // for Pocket PC.
 
-#if wxUSE_FILEDLG && defined(__SMARTPHONE__)
+#if wxUSE_FILEDLG && defined(__SMARTPHONE__) && defined(__WXWINCE__)
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -116,18 +112,14 @@ int wxFileDialog::ShowModal()
     wxWindow* parentWindow = GetParent();
     if (!parentWindow)
         parentWindow = wxTheApp->GetTopWindow();
-    
+
     wxString str = wxGetTextFromUser(m_message, _("File"), m_fileName, parentWindow);
-    if (str)
-    {
-        m_fileName = str;
-        m_fileNames.Add(str);
-        return wxID_OK;
-    }
-    else
-    {
+    if (str.empty())
         return wxID_CANCEL;
-    }
+
+    m_fileName = str;
+    m_fileNames.Add(str);
+    return wxID_OK;
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const
@@ -135,5 +127,4 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     files = m_fileNames;
 }
 
-#endif // wxUSE_FILEDLG
-
+#endif // wxUSE_FILEDLG && __SMARTPHONE__ && __WXWINCE__