X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4e64fb55ec2490f5cd5297e7a5c6ba35971884c..052d2fc5818243dadbc1ec54b1120e295304fc55:/src/motif/filedlg.cpp?ds=sidebyside diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp index 8f4d17b899..c244836db6 100644 --- a/src/motif/filedlg.cpp +++ b/src/motif/filedlg.cpp @@ -9,10 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#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 @@ -21,7 +24,6 @@ #include "wx/defs.h" #include "wx/utils.h" -#include "wx/dialog.h" #include "wx/filedlg.h" #include "wx/intl.h" #include "wx/app.h" @@ -47,7 +49,7 @@ #include "wx/motif/private.h" -IMPLEMENT_CLASS(wxFileDialog, wxDialog) +IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) #define DEFAULT_FILE_SELECTOR_SIZE 0 // Let Motif defines the size of File @@ -57,65 +59,6 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog) #define wxFSB_HEIGHT 500 -wxString wxFileSelector(const char *title, - const char *defaultDir, const char *defaultFileName, - const char *defaultExtension, const char *filter, int flags, - wxWindow *parent, int x, int y) -{ - // If there's a default extension specified but no filter, we create a suitable - // filter. - - wxString filter2(""); - if ( defaultExtension && !filter ) - filter2 = wxString("*.") + wxString(defaultExtension) ; - else if ( filter ) - filter2 = filter; - - wxString defaultDirString; - if (defaultDir) - defaultDirString = defaultDir; - else - defaultDirString = ""; - - wxString defaultFilenameString; - if (defaultFileName) - defaultFilenameString = defaultFileName; - else - defaultFilenameString = ""; - - wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y)); - - if ( fileDialog.ShowModal() == wxID_OK ) - { - return fileDialog.GetPath(); - } - else - return wxEmptyString; -} - -wxString wxFileSelectorEx(const char *title, - const char *defaultDir, - const char *defaultFileName, - int* defaultFilterIndex, - const char *filter, - int flags, - wxWindow* parent, - int x, - int y) - -{ - wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "", - defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y)); - - if ( fileDialog.ShowModal() == wxID_OK ) - { - *defaultFilterIndex = fileDialog.GetFilterIndex(); - return fileDialog.GetPath(); - } - else - return wxEmptyString; -} - wxString wxFileDialog::m_fileSelectorAnswer = ""; bool wxFileDialog::m_fileSelectorReturned = FALSE; @@ -151,9 +94,11 @@ void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSel static wxString ParseWildCard( const wxString& wild ) { +#ifdef __WXDEBUG__ static const wxChar* msg = _T("Motif file dialog does not understand this ") _T("wildcard syntax"); +#endif wxStringTokenizer tok( wild, _T("|") ); @@ -172,25 +117,20 @@ static wxString ParseWildCard( const wxString& wild ) 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) { - m_message = message; - m_dialogStyle = style; - m_parent = parent; - m_path = ""; - m_fileName = defaultFileName; - m_dir = defaultDir; - m_wildCard = wildCard; m_filterIndex = 1; - m_pos = pos; } static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget) { - wxWindow::DoChangeBackgroundColour((WXWidget) widget, *wxWHITE); + wxDoChangeBackgroundColour((WXWidget) widget, *wxWHITE); // Change colour of the scrolled areas of the listboxes Widget listParent = XtParent (widget); - wxWindow::DoChangeBackgroundColour((WXWidget) listParent, *wxWHITE, TRUE); +#if 0 + wxDoChangeBackgroundColour((WXWidget) listParent, *wxWHITE, TRUE); +#endif Widget hsb = (Widget) 0; Widget vsb = (Widget) 0; @@ -203,8 +143,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); - wxWindow::DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE); - wxWindow::DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE); + wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE); + wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE); if (hsb) XtVaSetValues (hsb, @@ -223,9 +163,7 @@ int wxFileDialog::ShowModal() // static char fileBuf[512]; Widget parentWidget = (Widget) 0; if (m_parent) - { parentWidget = (Widget) m_parent->GetTopWidget(); - } else parentWidget = (Widget) wxTheApp->GetTopLevelWidget(); // prepare the arg list @@ -260,7 +198,9 @@ int wxFileDialog::ShowModal() Widget shell = XtParent(fileSel); if (!m_message.IsNull()) - XtVaSetValues(shell, XmNtitle, (char*) (const char*) m_message, NULL); + XtVaSetValues(shell, + XmNtitle, wxConstCast(m_message.c_str(), char), + NULL); wxString entirePath(""); @@ -277,11 +217,6 @@ int wxFileDialog::ShowModal() entirePath = m_fileName; } - if (entirePath != "") - { - XmTextSetString(selectionWidget, (char*) (const char*) entirePath); - } - if (m_wildCard != "") { // return something understandable by Motif @@ -292,7 +227,7 @@ int wxFileDialog::ShowModal() else filter = wildCard; - XmTextSetString(filterWidget, (char*)filter.c_str()); + XmTextSetString(filterWidget, wxConstCast(filter.c_str(), char)); XmFileSelectionDoSearch(fileSel, NULL); } @@ -300,14 +235,17 @@ int wxFileDialog::ShowModal() // file selector on Solaris 1.5.1. if ( m_dir != "" ) { - XmString thePath = XmStringCreateLtoR ((char*) (const char*) m_dir, - XmSTRING_DEFAULT_CHARSET); + wxXmString thePath( m_dir ); XtVaSetValues (fileSel, - XmNdirectory, thePath, + XmNdirectory, thePath(), NULL); + } - XmStringFree(thePath); + if (entirePath != "") + { + XmTextSetString(selectionWidget, + wxConstCast(entirePath.c_str(), char)); } XtAddCallback(fileSel, XmNcancelCallback, (XtCallbackProc)wxFileSelCancel, (XtPointer)NULL); @@ -330,9 +268,9 @@ int wxFileDialog::ShowModal() XmNresizePolicy, XmRESIZE_NONE, NULL); #endif - // DoChangeBackgroundColour((WXWidget) fileSel, m_backgroundColour); - DoChangeBackgroundColour((WXWidget) filterWidget, *wxWHITE); - DoChangeBackgroundColour((WXWidget) selectionWidget, *wxWHITE); + // wxDoChangeBackgroundColour((WXWidget) fileSel, m_backgroundColour); + wxDoChangeBackgroundColour((WXWidget) filterWidget, *wxWHITE); + wxDoChangeBackgroundColour((WXWidget) selectionWidget, *wxWHITE); wxChangeListBoxColours(this, dirListWidget); wxChangeListBoxColours(this, fileListWidget); @@ -345,28 +283,25 @@ int wxFileDialog::ShowModal() wxEndBusyCursor(); XtAddGrab(XtParent(fileSel), TRUE, FALSE); + XtAppContext context = (XtAppContext) wxTheApp->GetAppContext(); XEvent event; while (!m_fileSelectorReturned) { - XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll); + XtAppNextEvent(context, &event); + XtDispatchEvent(&event); } XtRemoveGrab(XtParent(fileSel)); - XmUpdateDisplay((Widget) wxTheApp->GetTopLevelWidget()); // Experimental + // XmUpdateDisplay((Widget) wxTheApp->GetTopLevelWidget()); // Experimental + + Display* display = XtDisplay(fileSel); - // XtDestroyWidget(fileSel); XtUnmapWidget(XtParent(fileSel)); XtDestroyWidget(XtParent(fileSel)); // Now process all events, because otherwise // this might remain on the screen - XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); - while (XtAppPending((XtAppContext) wxTheApp->GetAppContext())) - { - XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())); - XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event); - XtDispatchEvent(&event); - } + wxFlushEvents(display); m_path = m_fileSelectorAnswer; m_fileName = wxFileNameFromPath(m_fileSelectorAnswer); @@ -378,39 +313,3 @@ int wxFileDialog::ShowModal() return wxID_OK; } -// Generic file load/save dialog -static wxString -wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent) -{ - char *ext = (char *)extension; - - wxString prompt; - wxString str; - if (load) - str = _("Load %s file"); - else - str = _("Save %s file"); - prompt.Printf(str, what); - - if (*ext == '.') - ext++; - wxString wild; - wild.Printf("*.%s", ext); - - return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent); -} - -// Generic file load dialog -wxString wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent) -{ - return wxDefaultFileSelector(TRUE, what, extension, default_name, parent); -} - - -// Generic file save dialog -wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent) -{ - return wxDefaultFileSelector(FALSE, what, extension, default_name, parent); -} - -