no real changes, just minor refactoring and cleanup

[wxWidgets.git] / src / msw / wince / filedlgwce.cpp

diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp
index bb0a24773b6004943f198c90c2c639d8750dd436..e5c59407a6e79ba790e8af3af834914cea86d927 100644 (file)
--- a/src/msw/wince/filedlgwce.cpp
+++ b/src/msw/wince/filedlgwce.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/wince/filedlgwce.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,13 +27,14 @@
 // Only use this for MS SmartPhone. Use standard file dialog
 // for Pocket PC.
 
 // 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__)
+
+#include "wx/filedlg.h"

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/dialog.h"

-    #include "wx/filedlg.h"

     #include "wx/filefn.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/filefn.h"
     #include "wx/intl.h"
     #include "wx/log.h"


@@ -71,12 +68,14 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
                            const wxString& defaultFileName,
                            const wxString& wildCard,
                            long style,
                            const wxString& defaultFileName,
                            const wxString& wildCard,
                            long style,

-                           const wxPoint& WXUNUSED(pos))
+                           const wxPoint& WXUNUSED(pos),
+                           const wxSize& WXUNUSED(sz),
+                           const wxString& WXUNUSED(name))

 {
     m_message = message;
 {
     m_message = message;

-    m_dialogStyle = style;
-    if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
-        m_dialogStyle &= ~wxMULTIPLE;
+    m_windowStyle = style;
+    if ( ( m_windowStyle & wxFD_MULTIPLE ) && ( m_windowStyle & wxFD_SAVE ) )
+        m_windowStyle &= ~wxFD_MULTIPLE;

     m_parent = parent;
     m_path = wxEmptyString;
     m_fileName = defaultFileName;
     m_parent = parent;
     m_path = wxEmptyString;
     m_fileName = defaultFileName;


@@ -106,7 +105,7 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;
 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;

-    wxSplitPath(path, &m_dir, &m_fileName, &ext);
+    wxFileName::SplitPath(path, &m_dir, &m_fileName, &ext);

     if ( !ext.empty() )
         m_fileName << _T('.') << ext;
 }
     if ( !ext.empty() )
         m_fileName << _T('.') << ext;
 }


@@ -116,18 +115,14 @@ int wxFileDialog::ShowModal()
     wxWindow* parentWindow = GetParent();
     if (!parentWindow)
         parentWindow = wxTheApp->GetTopWindow();
     wxWindow* parentWindow = GetParent();
     if (!parentWindow)
         parentWindow = wxTheApp->GetTopWindow();

-    
+

     wxString str = wxGetTextFromUser(m_message, _("File"), m_fileName, parentWindow);
     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;
         return wxID_CANCEL;

-    }
+
+    m_fileName = str;
+    m_fileNames.Add(str);
+    return wxID_OK;

 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const


@@ -135,5 +130,4 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     files = m_fileNames;
 }
 
     files = m_fileNames;
 }
 

-#endif // wxUSE_FILEDLG
-
+#endif // wxUSE_FILEDLG && __SMARTPHONE__ && __WXWINCE__