projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug #1040683: Remove assert when deleting menu entry.
[wxWidgets.git]
/
src
/
msw
/
wince
/
filedlgwce.cpp
diff --git
a/src/msw/wince/filedlgwce.cpp
b/src/msw/wince/filedlgwce.cpp
index bb0a24773b6004943f198c90c2c639d8750dd436..aa11f5f4542184a9e9da10b9fd1811c25f8f66be 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
@@
-31,7
+31,7
@@
// 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__)
#ifndef WX_PRECOMP
#include "wx/utils.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
@@
-116,7
+116,7
@@
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);
if (str)
{
wxString str = wxGetTextFromUser(m_message, _("File"), m_fileName, parentWindow);
if (str)
{
@@
-135,5
+135,4
@@
void wxFileDialog::GetFilenames(wxArrayString& files) const
files = m_fileNames;
}
files = m_fileNames;
}
-#endif // wxUSE_FILEDLG
-
+#endif // wxUSE_FILEDLG && __SMARTPHONE__ && __WXWINCE__