/////////////////////////////////////////////////////////////////////////////
-// Name: filedlg.cpp
+// Name: src/motif/filedlg.cpp
// Purpose: wxFileDialog
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "filedlg.h"
-#endif
-
// 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/defs.h"
-#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"
#define wxFSB_HEIGHT 500
-wxString wxFileDialog::m_fileSelectorAnswer = "";
+wxString wxFileDialog::m_fileSelectorAnswer = wxEmptyString;
bool wxFileDialog::m_fileSelectorReturned = false;
static void wxFileSelClose(Widget WXUNUSED(w),
void* WXUNUSED(client_data),
XmAnyCallbackStruct *WXUNUSED(call_data))
{
- wxFileDialog::m_fileSelectorAnswer = "";
+ wxFileDialog::m_fileSelectorAnswer = wxEmptyString;
wxFileDialog::m_fileSelectorReturned = true;
}
void wxFileSelCancel( Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data),
XmFileSelectionBoxCallbackStruct *WXUNUSED(cbs) )
{
- wxFileDialog::m_fileSelectorAnswer = "";
+ wxFileDialog::m_fileSelectorAnswer = wxEmptyString;
wxFileDialog::m_fileSelectorReturned = true;
}
{
char *filename = NULL;
if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) {
- wxFileDialog::m_fileSelectorAnswer = "";
+ wxFileDialog::m_fileSelectorAnswer = wxEmptyString;
wxFileDialog::m_fileSelectorReturned = true;
} else {
if (filename) {
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;
}
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);
- if ( wxFont::GetFontTag() == (WXString) XmNfontList )
- {
- XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++;
- XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++;
- XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++;
- }
- else
- {
- XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++;
- XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++;
- XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++;
- }
+#if __WXMOTIF20__ && !__WXLESSTIF__
+ XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++;
+ XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++;
+ XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++;
+#else
+ XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++;
+ XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++;
+ XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++;
+#endif
Widget fileSel = XmCreateFileSelectionDialog(parentWidget,
- "file_selector", args, ac);
+ wxMOTIF_STR("file_selector"),
+ args, ac);
#define wxFSChild( name ) \
XmFileSelectionBoxGetChild(fileSel, name)
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 != "")
+ if (!m_wildCard.empty())
{
// return something understandable by Motif
wxString wildCard = ParseWildCard( m_wildCard );
wxString filter;
- if (m_dir != "")
+ if (!m_dir.empty())
filter = m_dir + wxString("/") + wildCard;
else
filter = wildCard;
- XmTextSetString(filterWidget, wxConstCast(filter.c_str(), char));
+ XmTextSetString(filterWidget, filter.char_str());
XmFileSelectionDoSearch(fileSel, NULL);
}
// Suggested by Terry Gitnick, 16/9/97, because of change in Motif
// file selector on Solaris 1.5.1.
- if ( m_dir != "" )
+ if ( !m_dir.empty() )
{
wxXmString thePath( m_dir );
NULL);
}
- wxString entirePath("");
+ wxString entirePath;
- if (m_dir != "")
+ if (!m_dir.empty())
{
entirePath = m_dir + wxString("/") + m_fileName;
}
entirePath = m_fileName;
}
- if (entirePath != "")
+ if (!entirePath.empty())
{
- XmTextSetString(selectionWidget,
- wxConstCast(entirePath.c_str(), char));
+ XmTextSetString(selectionWidget, entirePath.char_str());
}
XtAddCallback(fileSel, XmNcancelCallback,
XtManageChild(fileSel);
- m_fileSelectorAnswer = "";
+ m_fileSelectorAnswer = wxEmptyString;
m_fileSelectorReturned = false;
wxEndBusyCursor();
m_fileName = wxFileNameFromPath(m_fileSelectorAnswer);
m_dir = wxPathOnly(m_path);
- if (m_fileName == "")
+ if (m_fileName.empty())
return wxID_CANCEL;
else
return wxID_OK;
}
-
projects / wxWidgets.git / blobdiff