X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..1abfa172c547a37751e598084fb8d541071471a3:/src/motif/filedlg.cpp?ds=sidebyside diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp index c244836db6..889ee87e14 100644 --- a/src/motif/filedlg.cpp +++ b/src/motif/filedlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filedlg.cpp +// Name: src/motif/filedlg.cpp // Purpose: wxFileDialog // Author: Julian Smart // Modified by: @@ -9,10 +9,6 @@ // 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" @@ -22,13 +18,17 @@ #define XtWindow XTWINDOW #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" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/settings.h" +#endif + #include "wx/tokenzr.h" +#include "wx/stockitem.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -59,36 +59,36 @@ IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) #define wxFSB_HEIGHT 500 -wxString wxFileDialog::m_fileSelectorAnswer = ""; -bool wxFileDialog::m_fileSelectorReturned = FALSE; +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_fileSelectorReturned = TRUE; + 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_fileSelectorReturned = TRUE; + wxFileDialog::m_fileSelectorAnswer = wxEmptyString; + wxFileDialog::m_fileSelectorReturned = true; } void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSelectionBoxCallbackStruct *cbs) { char *filename = NULL; if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) { - wxFileDialog::m_fileSelectorAnswer = ""; - wxFileDialog::m_fileSelectorReturned = TRUE; + wxFileDialog::m_fileSelectorAnswer = wxEmptyString; + wxFileDialog::m_fileSelectorReturned = true; } else { if (filename) { wxFileDialog::m_fileSelectorAnswer = filename; XtFree(filename); } - wxFileDialog::m_fileSelectorReturned = TRUE; + wxFileDialog::m_fileSelectorReturned = true; } } @@ -100,24 +100,25 @@ static wxString ParseWildCard( const wxString& wild ) _T("wildcard syntax"); #endif - wxStringTokenizer tok( wild, _T("|") ); + 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( tok.CountTokens() <= 2, _T("*.*"), msg ); + // check for *.txt;*.rtf + wxStringTokenizer tok2( wildFilters[0], _T(";") ); + wxString wildcard = tok2.GetNextToken(); - if( tok.CountTokens() == 1 ) return wild; - - // CountTokens == 2 - tok.GetNextToken(); - wxStringTokenizer tok2( tok.GetNextToken(), _T(";") ); - - wxCHECK_MSG( tok2.CountTokens() == 1, tok2.GetNextToken(), msg ); - return tok2.GetNextToken(); + wxCHECK_MSG( tok2.CountTokens() <= 1, wildcard, msg ); + return wildcard; } 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; } @@ -129,7 +130,7 @@ static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget) // Change colour of the scrolled areas of the listboxes Widget listParent = XtParent (widget); #if 0 - wxDoChangeBackgroundColour((WXWidget) listParent, *wxWHITE, TRUE); + wxDoChangeBackgroundColour((WXWidget) listParent, *wxWHITE, true); #endif Widget hsb = (Widget) 0; @@ -143,8 +144,8 @@ static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget) * function to change them (by default, taken from wxSystemSettings) */ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE); - wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE); + wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, true); + wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, true); if (hsb) XtVaSetValues (hsb, @@ -167,73 +168,95 @@ int wxFileDialog::ShowModal() else parentWidget = (Widget) wxTheApp->GetTopLevelWidget(); // prepare the arg list + Display* dpy = XtDisplay(parentWidget); Arg args[10]; int ac = 0; - wxComputeColours (XtDisplay(parentWidget), & m_backgroundColour, - (wxColour*) 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++; - + if (m_backgroundColour.Ok()) + { + wxComputeColours (dpy, & m_backgroundColour, (wxColour*) NULL); - Widget fileSel = XmCreateFileSelectionDialog(parentWidget, "file_selector", args, ac); - XtUnmanageChild(XmFileSelectionBoxGetChild(fileSel, XmDIALOG_HELP_BUTTON)); + 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++; + } - 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); + wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - // 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); if (!m_message.IsNull()) XtVaSetValues(shell, - XmNtitle, wxConstCast(m_message.c_str(), char), + XmNtitle, (const char*)m_message.mb_str(), 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; - 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 ); @@ -242,14 +265,26 @@ int wxFileDialog::ShowModal() NULL); } - if (entirePath != "") + wxString entirePath; + + if (!m_dir.empty()) { - XmTextSetString(selectionWidget, - wxConstCast(entirePath.c_str(), char)); + entirePath = m_dir + wxString("/") + m_fileName; + } + else + { + entirePath = m_fileName; + } + + if (!entirePath.empty()) + { + XmTextSetString(selectionWidget, entirePath.char_str()); } - 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); @@ -257,7 +292,7 @@ int wxFileDialog::ShowModal() // 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; @@ -268,7 +303,6 @@ int wxFileDialog::ShowModal() XmNresizePolicy, XmRESIZE_NONE, NULL); #endif - // wxDoChangeBackgroundColour((WXWidget) fileSel, m_backgroundColour); wxDoChangeBackgroundColour((WXWidget) filterWidget, *wxWHITE); wxDoChangeBackgroundColour((WXWidget) selectionWidget, *wxWHITE); @@ -277,12 +311,12 @@ int wxFileDialog::ShowModal() XtManageChild(fileSel); - m_fileSelectorAnswer = ""; - m_fileSelectorReturned = FALSE; + m_fileSelectorAnswer = wxEmptyString; + m_fileSelectorReturned = false; wxEndBusyCursor(); - XtAddGrab(XtParent(fileSel), TRUE, FALSE); + XtAddGrab(XtParent(fileSel), True, False); XtAppContext context = (XtAppContext) wxTheApp->GetAppContext(); XEvent event; while (!m_fileSelectorReturned) @@ -292,24 +326,19 @@ int wxFileDialog::ShowModal() } 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; } -