// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#define XtWindow XTWINDOW
+#include "wx/filedlg.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/settings.h"
#endif
-#include "wx/utils.h"
-#include "wx/filedlg.h"
-#include "wx/intl.h"
-#include "wx/app.h"
-#include "wx/settings.h"
#include "wx/tokenzr.h"
#include "wx/stockitem.h"
+#include "wx/modalhook.h"
#ifdef __VMS__
#pragma message disable nosimpint
static wxString ParseWildCard( const wxString& wild )
{
-#ifdef __WXDEBUG__
- static const wxChar* msg =
- _T("Motif file dialog does not understand this ")
- _T("wildcard syntax");
+#if wxDEBUG_LEVEL
+ static const char *msg =
+ "Motif file dialog does not understand this wildcard syntax";
#endif
wxArrayString wildDescriptions, wildFilters;
const size_t count = wxParseCommonDialogsFilter(wild,
wildDescriptions,
wildFilters);
- wxCHECK_MSG( count, _T("*.*"), wxT("wxFileDialog: bad wildcard string") );
- wxCHECK_MSG( count == 1, _T("*.*"), msg );
+ wxCHECK_MSG( count, wxT("*.*"), wxT("wxFileDialog: bad wildcard string") );
+ wxCHECK_MSG( count == 1, wxT("*.*"), msg );
// check for *.txt;*.rtf
- wxStringTokenizer tok2( wildFilters[0], _T(";") );
+ wxStringTokenizer tok2( wildFilters[0], wxT(";") );
wxString wildcard = tok2.GetNextToken();
wxCHECK_MSG( tok2.CountTokens() <= 1, wildcard, msg );
wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
- long style, const wxPoint& pos)
- :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
+ long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
+ :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)
{
- m_filterIndex = 1;
}
static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)
int wxFileDialog::ShowModal()
{
+ WX_HOOK_MODAL_DIALOG();
+
wxBeginBusyCursor();
// static char fileBuf[512];
Arg args[10];
int ac = 0;
- wxComputeColours (dpy, & m_backgroundColour, (wxColour*) NULL);
+ if (m_backgroundColour.IsOk())
+ {
+ wxComputeColours (dpy, & m_backgroundColour, NULL);
- XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++;
- XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++;
- XtSetArg(args[ac], XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel); ac++;
- XtSetArg(args[ac], XmNforeground, g_itemColors[wxFORE_INDEX].pixel); ac++;
+ XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++;
+ XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++;
+ XtSetArg(args[ac], XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel); ac++;
+ XtSetArg(args[ac], XmNforeground, g_itemColors[wxFORE_INDEX].pixel); ac++;
+ }
wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
Widget shell = XtParent(fileSel);
- if (!m_message.IsNull())
+ if ( !m_message.empty() )
XtVaSetValues(shell,
- XmNtitle, wxConstCast(m_message.c_str(), char),
+ XmNtitle, (const char*)m_message.mb_str(),
NULL);
if (!m_wildCard.empty())
else
filter = wildCard;
- XmTextSetString(filterWidget, wxConstCast(filter.c_str(), char));
+ XmTextSetString(filterWidget, filter.char_str());
XmFileSelectionDoSearch(fileSel, NULL);
}
if (!entirePath.empty())
{
- XmTextSetString(selectionWidget,
- wxConstCast(entirePath.c_str(), char));
+ XmTextSetString(selectionWidget, entirePath.char_str());
}
XtAddCallback(fileSel, XmNcancelCallback,