#include "wx/app.h"
#include "wx/settings.h"
#include "wx/tokenzr.h"
+#include "wx/stockitem.h"
#ifdef __VMS__
#pragma message disable nosimpint
#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) {
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++;
- }
-
- Widget fileSel = XmCreateFileSelectionDialog(parentWidget, "file_selector", args, ac);
- XtUnmanageChild(XmFileSelectionBoxGetChild(fileSel, XmDIALOG_HELP_BUTTON));
-
- Widget filterWidget = XmFileSelectionBoxGetChild(fileSel, XmDIALOG_FILTER_TEXT);
- Widget selectionWidget = XmFileSelectionBoxGetChild(fileSel, XmDIALOG_TEXT);
- Widget dirListWidget = XmFileSelectionBoxGetChild(fileSel, XmDIALOG_DIR_LIST);
- Widget fileListWidget = XmFileSelectionBoxGetChild(fileSel, XmDIALOG_LIST);
-
- // code using these vars disabled
-#if 0
- Widget okWidget = XmFileSelectionBoxGetChild(fileSel, XmDIALOG_OK_BUTTON);
- Widget applyWidget = XmFileSelectionBoxGetChild(fileSel, XmDIALOG_APPLY_BUTTON);
- Widget cancelWidget = XmFileSelectionBoxGetChild(fileSel, XmDIALOG_CANCEL_BUTTON);
+#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,
+ wxMOTIF_STR("file_selector"),
+ args, ac);
+#define wxFSChild( name ) \
+ XmFileSelectionBoxGetChild(fileSel, name)
+
+ XtUnmanageChild(wxFSChild(XmDIALOG_HELP_BUTTON));
+
+ Widget filterWidget = wxFSChild(XmDIALOG_FILTER_TEXT);
+ Widget selectionWidget = wxFSChild(XmDIALOG_TEXT);
+ Widget dirListWidget = wxFSChild(XmDIALOG_DIR_LIST);
+ Widget fileListWidget = wxFSChild(XmDIALOG_LIST);
+
+ // for changing labels
+ Widget okWidget = wxFSChild(XmDIALOG_OK_BUTTON);
+ Widget applyWidget = wxFSChild(XmDIALOG_APPLY_BUTTON);
+ Widget cancelWidget = wxFSChild(XmDIALOG_CANCEL_BUTTON);
+ Widget dirlistLabel = wxFSChild(XmDIALOG_DIR_LIST_LABEL);
+ Widget filterLabel = wxFSChild(XmDIALOG_FILTER_LABEL);
+ Widget listLabel = wxFSChild(XmDIALOG_LIST_LABEL);
+ Widget selectionLabel = wxFSChild(XmDIALOG_SELECTION_LABEL);
+
+#undef wxFSChild
+
+ // change labels
+ wxXmString btnOK( wxGetStockLabel( wxID_OK, false ) ),
+ btnCancel( wxGetStockLabel( wxID_CANCEL, false ) ),
+ btnFilter( _("Filter") ), lblFilter( _("Filter") ),
+ lblDirectories( _("Directories") ),
+ lblFiles( _("Files" ) ), lblSelection( _("Selection") );
+
+ XtVaSetValues( okWidget, XmNlabelString, btnOK(), NULL );
+ XtVaSetValues( applyWidget, XmNlabelString, btnFilter(), NULL );
+ XtVaSetValues( cancelWidget, XmNlabelString, btnCancel(), NULL );
+ XtVaSetValues( dirlistLabel, XmNlabelString, lblDirectories(), NULL );
+ XtVaSetValues( filterLabel, XmNlabelString, lblFilter(), NULL );
+ XtVaSetValues( listLabel, XmNlabelString, lblFiles(), NULL );
+ XtVaSetValues( selectionLabel, XmNlabelString, lblSelection(), NULL );
Widget shell = XtParent(fileSel);
XmNtitle, wxConstCast(m_message.c_str(), char),
NULL);
- wxString entirePath("");
-
- if ((m_dir != "") && (m_fileName != ""))
- {
- entirePath = m_dir + wxString("/") + m_fileName;
- }
- else if ((m_dir != "") && (m_fileName == ""))
- {
- entirePath = m_dir + wxString("/");
- }
- else if ((m_dir == "") && (m_fileName != ""))
- {
- entirePath = m_fileName;
- }
-
- 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;
// 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);
}
- if (entirePath != "")
+ wxString entirePath;
+
+ if (!m_dir.empty())
+ {
+ entirePath = m_dir + wxString("/") + m_fileName;
+ }
+ else
+ {
+ entirePath = m_fileName;
+ }
+
+ if (!entirePath.empty())
{
XmTextSetString(selectionWidget,
wxConstCast(entirePath.c_str(), char));
}
- XtAddCallback(fileSel, XmNcancelCallback, (XtCallbackProc)wxFileSelCancel, (XtPointer)NULL);
- XtAddCallback(fileSel, XmNokCallback, (XtCallbackProc)wxFileSelOk, (XtPointer)NULL);
+ XtAddCallback(fileSel, XmNcancelCallback,
+ (XtCallbackProc)wxFileSelCancel, (XtPointer)NULL);
+ XtAddCallback(fileSel, XmNokCallback,
+ (XtCallbackProc)wxFileSelOk, (XtPointer)NULL);
XtAddCallback(fileSel, XmNunmapCallback,
(XtCallbackProc)wxFileSelClose, (XtPointer)this);
// I'm not sure about what you mean with XmVersion.
// If this is for Motif1.1/Motif1.2, then check XmVersion>=1200
// (Motif1.1.4 ==> XmVersion 1100 )
- // Nevertheless, I put here a #define, so anyone can choose in (I)makefile...
+ // Nevertheless, I put here a #define, so anyone can choose in (I)makefile.
//
#if !DEFAULT_FILE_SELECTOR_SIZE
int width = wxFSB_WIDTH;
XmNresizePolicy, XmRESIZE_NONE,
NULL);
#endif
- // wxDoChangeBackgroundColour((WXWidget) fileSel, m_backgroundColour);
wxDoChangeBackgroundColour((WXWidget) filterWidget, *wxWHITE);
wxDoChangeBackgroundColour((WXWidget) selectionWidget, *wxWHITE);
XtManageChild(fileSel);
- m_fileSelectorAnswer = "";
+ m_fileSelectorAnswer = wxEmptyString;
m_fileSelectorReturned = false;
wxEndBusyCursor();
}
XtRemoveGrab(XtParent(fileSel));
- // XmUpdateDisplay((Widget) wxTheApp->GetTopLevelWidget()); // Experimental
-
- Display* display = XtDisplay(fileSel);
-
XtUnmapWidget(XtParent(fileSel));
XtDestroyWidget(XtParent(fileSel));
// Now process all events, because otherwise
// this might remain on the screen
- wxFlushEvents(display);
+ wxFlushEvents(XtDisplay(fileSel));
m_path = m_fileSelectorAnswer;
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