projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Have wxComboCtrl generate wxEVT_COMMAND_COMBOBOX_DROPDOWN and wxEVT_COMMAND_COMBOBOX_...
[wxWidgets.git]
/
src
/
os2
/
filedlg.cpp
diff --git
a/src/os2/filedlg.cpp
b/src/os2/filedlg.cpp
index 96c26f14cae56fc930771c55a08e635e7b50695f..f4fc9da6f11269bc69734045a1ca7ed63b9fb494 100644
(file)
--- a/
src/os2/filedlg.cpp
+++ b/
src/os2/filedlg.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: filedlg.cpp
+// Name:
src/os2/
filedlg.cpp
// Purpose: wxFileDialog
// Author: David Webster
// Modified by:
// Purpose: wxFileDialog
// Author: David Webster
// Modified by:
@@
-18,10
+18,12
@@
#if wxUSE_FILEDLG
#if wxUSE_FILEDLG
+#include "wx/filedlg.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/msgdlg.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/msgdlg.h"
- #include "wx/file
dlg
.h"
+ #include "wx/file
name
.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/app.h"
@@
-78,8
+80,7
@@
wxFileDialog::wxFileDialog (
:wxFileDialogBase(pParent, rsMessage, rsDefaultDir, rsDefaultFileName, rsWildCard, lStyle, rPos, sz, name)
{
:wxFileDialogBase(pParent, rsMessage, rsDefaultDir, rsDefaultFileName, rsWildCard, lStyle, rPos, sz, name)
{
- if ((m_windowStyle & wxMULTIPLE) && (m_windowStyle & wxSAVE))
- m_windowStyle &= ~wxMULTIPLE;
+ // NB: all style checks are done by wxFileDialogBase::Create
m_filterIndex = 1;
} // end of wxFileDialog::wxFileDialog
m_filterIndex = 1;
} // end of wxFileDialog::wxFileDialog
@@
-92,8
+93,8
@@
void wxFileDialog::GetPaths (
size_t nCount = m_fileNames.GetCount();
rasPaths.Empty();
size_t nCount = m_fileNames.GetCount();
rasPaths.Empty();
- if (m_dir.Last() !=
_
T('\\'))
- sDir +=
_
T('\\');
+ if (m_dir.Last() !=
wx
T('\\'))
+ sDir +=
wx
T('\\');
for ( size_t n = 0; n < nCount; n++ )
{
for ( size_t n = 0; n < nCount; n++ )
{
@@
-126,19
+127,14
@@
int wxFileDialog::ShowModal()
*zFileNameBuffer = wxT('\0');
*zTitleBuffer = wxT('\0');
*zFileNameBuffer = wxT('\0');
*zTitleBuffer = wxT('\0');
- if (m_windowStyle & wxSAVE)
+ if (m_windowStyle & wx
FD_
SAVE)
lFlags = FDS_SAVEAS_DIALOG;
else
lFlags = FDS_OPEN_DIALOG;
lFlags = FDS_SAVEAS_DIALOG;
else
lFlags = FDS_OPEN_DIALOG;
-#if WXWIN_COMPATIBILITY_2_4
- if (m_windowStyle & wxHIDE_READONLY)
+ if (m_windowStyle & wxFD_SAVE)
lFlags |= FDS_SAVEAS_DIALOG;
lFlags |= FDS_SAVEAS_DIALOG;
-#endif
-
- if (m_windowStyle & wxSAVE)
- lFlags |= FDS_SAVEAS_DIALOG;
- if (m_windowStyle & wxMULTIPLE )
+ if (m_windowStyle & wxFD_MULTIPLE)
lFlags |= FDS_OPEN_DIALOG | FDS_MULTIPLESEL;
vFileDlg.cbSize = sizeof(FILEDLG);
lFlags |= FDS_OPEN_DIALOG | FDS_MULTIPLESEL;
vFileDlg.cbSize = sizeof(FILEDLG);
@@
-157,21
+153,21
@@
int wxFileDialog::ShowModal()
switch (ch)
{
switch (ch)
{
- case
_
T('/'):
+ case
wx
T('/'):
//
// Convert to backslash
//
//
// Convert to backslash
//
- ch =
_
T('\\');
+ ch =
wx
T('\\');
//
// Fall through
//
//
// Fall through
//
- case
_
T('\\'):
+ case
wx
T('\\'):
while (i < nLen - 1)
{
wxChar chNext = m_dir[i + 1];
while (i < nLen - 1)
{
wxChar chNext = m_dir[i + 1];
- if (chNext !=
_T('\\') && chNext != _
T('/'))
+ if (chNext !=
wxT('\\') && chNext != wx
T('/'))
break;
//
break;
//
@@
-198,7
+194,7
@@
int wxFileDialog::ShowModal()
else
sTheFilter = m_wildCard;
else
sTheFilter = m_wildCard;
- wxStrtok(
(wxChar*)sTheFilter.c
_str(), wxT("|"), &pzFilterBuffer);
+ wxStrtok(
sTheFilter.wchar
_str(), wxT("|"), &pzFilterBuffer);
while(pzFilterBuffer != NULL)
{
if (nCount > 0 && !(nCount % 2))
while(pzFilterBuffer != NULL)
{
if (nCount > 0 && !(nCount % 2))
@@
-224,7
+220,7
@@
int wxFileDialog::ShowModal()
if (hWnd && vFileDlg.lReturn == DID_OK)
{
m_fileNames.Empty();
if (hWnd && vFileDlg.lReturn == DID_OK)
{
m_fileNames.Empty();
- if ((m_windowStyle & wxMULTIPLE ) && vFileDlg.ulFQFCount > 1)
+ if ((m_windowStyle & wx
FD_
MULTIPLE ) && vFileDlg.ulFQFCount > 1)
{
for (int i = 0; i < (int)vFileDlg.ulFQFCount; i++)
{
{
for (int i = 0; i < (int)vFileDlg.ulFQFCount; i++)
{
@@
-238,7
+234,7
@@
int wxFileDialog::ShowModal()
}
::WinFreeFileDlgList(vFileDlg.papszFQFilename);
}
}
::WinFreeFileDlgList(vFileDlg.papszFQFilename);
}
- else if (!(m_windowStyle & wxSAVE))
+ else if (!(m_windowStyle & wx
FD_
SAVE))
{
m_path = (wxChar*)vFileDlg.szFullFile;
m_fileName = wxFileNameFromPath(wxString((const wxChar*)vFileDlg.szFullFile));
{
m_path = (wxChar*)vFileDlg.szFullFile;
m_fileName = wxFileNameFromPath(wxString((const wxChar*)vFileDlg.szFullFile));
@@
-253,11
+249,11
@@
int wxFileDialog::ShowModal()
int nIdx = wxStrlen(zFileNameBuffer) - 1;
wxString sExt;
int nIdx = wxStrlen(zFileNameBuffer) - 1;
wxString sExt;
- wxSplitPath( zFileNameBuffer
- ,&m_path
- ,&m_fileName
- ,&sExt
- );
+ wx
FileName::
SplitPath( zFileNameBuffer
+
,&m_path
+
,&m_fileName
+
,&sExt
+
);
if (zFileNameBuffer[nIdx] == wxT('.') || sExt.empty())
{
zFileNameBuffer[nIdx] = wxT('\0');
if (zFileNameBuffer[nIdx] == wxT('.') || sExt.empty())
{
zFileNameBuffer[nIdx] = wxT('\0');
@@
-301,10
+297,10
@@
int wxFileDialog::ShowModal()
m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile);
//
m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile);
//
- // === Simulating the wxOVERWRITE_PROMPT >>============================
+ // === Simulating the wx
FD_
OVERWRITE_PROMPT >>============================
//
//
- if ((m_windowStyle & wxOVERWRITE_PROMPT) &&
- (m_windowStyle & wxSAVE) &&
+ if ((m_windowStyle & wx
FD_
OVERWRITE_PROMPT) &&
+ (m_windowStyle & wx
FD_
SAVE) &&
(wxFileExists(m_path.c_str())))
{
wxString sMessageText;
(wxFileExists(m_path.c_str())))
{
wxString sMessageText;