// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "filedlg.h"
#endif
#include "wx/defs.h"
#include "wx/utils.h"
-#include "wx/dialog.h"
#include "wx/filedlg.h"
#include "wx/intl.h"
#include "wx/app.h"
#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
#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;
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("|") );
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);
#if 0
- wxWindow::DoChangeBackgroundColour((WXWidget) listParent, *wxWHITE, TRUE);
+ wxDoChangeBackgroundColour((WXWidget) listParent, *wxWHITE, TRUE);
#endif
Widget hsb = (Widget) 0;
* 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,
// 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
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("");
else
filter = wildCard;
- XmTextSetString(filterWidget, (char*)filter.c_str());
+ XmTextSetString(filterWidget, wxConstCast(filter.c_str(), char));
XmFileSelectionDoSearch(fileSel, NULL);
}
if (entirePath != "")
{
- XmTextSetString(selectionWidget, (char*)entirePath.c_str());
+ XmTextSetString(selectionWidget,
+ wxConstCast(entirePath.c_str(), char));
}
XtAddCallback(fileSel, XmNcancelCallback, (XtCallbackProc)wxFileSelCancel, (XtPointer)NULL);
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);
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);
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);
-}
-
-
projects / wxWidgets.git / blobdiff