Convert back to UNIX line endings (again)

[wxWidgets.git] / src / motif / filedlg.cpp

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 00b63d4ab6040a57e0ca61ca4a08b18fc7ad7721..c244836db6d9beb09e6c0c1829c3cf653a31a1a7 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -9,18 +9,30 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "filedlg.h"
 #endif
 
 #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
+#endif
+

 #include "wx/defs.h"
 #include "wx/utils.h"
 #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/settings.h"
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 #include "wx/app.h"
 #include "wx/settings.h"

+#include "wx/tokenzr.h"

 
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/MwmUtil.h>
 #include <Xm/Label.h>
 #include <Xm/Xm.h>
 #include <Xm/MwmUtil.h>
 #include <Xm/Label.h>


@@ -31,12 +43,13 @@
 #include <Xm/FileSB.h>
 #include <Xm/RowColumn.h>
 #include <Xm/LabelG.h>
 #include <Xm/FileSB.h>
 #include <Xm/RowColumn.h>
 #include <Xm/LabelG.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
-#endif
+IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)

 
 #define DEFAULT_FILE_SELECTOR_SIZE 0
 // Let Motif defines the size of File
 
 #define DEFAULT_FILE_SELECTOR_SIZE 0
 // Let Motif defines the size of File


@@ -46,68 +59,17 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 #define wxFSB_HEIGHT               500
 
 
 #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)
+wxString wxFileDialog::m_fileSelectorAnswer = "";
+bool wxFileDialog::m_fileSelectorReturned = FALSE;

 
 

+static void wxFileSelClose(Widget WXUNUSED(w),
+                           void* WXUNUSED(client_data),
+                           XmAnyCallbackStruct *WXUNUSED(call_data))

 {
 {

-    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;
+    wxFileDialog::m_fileSelectorAnswer = "";
+    wxFileDialog::m_fileSelectorReturned = TRUE;

 }
 
 }
 

-wxString wxFileDialog::m_fileSelectorAnswer = "";
-bool wxFileDialog::m_fileSelectorReturned = FALSE;
-

 void wxFileSelCancel( Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data),
                      XmFileSelectionBoxCallbackStruct *WXUNUSED(cbs) )
 {
 void wxFileSelCancel( Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data),
                      XmFileSelectionBoxCallbackStruct *WXUNUSED(cbs) )
 {


@@ -130,28 +92,45 @@ 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("|") );
+
+    wxCHECK_MSG( tok.CountTokens() <= 2, _T("*.*"), msg );
+
+    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();
+}
+

 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
                            long style, const wxPoint& pos)
 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_filterIndex = 1;

-    m_pos = pos;

 }
 
 static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)
 {
 }
 
 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);
 
     // 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;
 
     Widget hsb = (Widget) 0;
     Widget vsb = (Widget) 0;


@@ -163,9 +142,9 @@ static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)
    /* TODO: should scrollbars be affected? Should probably have separate
     * function to change them (by default, taken from wxSystemSettings)
     */
    /* TODO: should scrollbars be affected? Should probably have separate
     * function to change them (by default, taken from wxSystemSettings)
     */

-    wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-    wxWindow::DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
-    wxWindow::DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
+    wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);

 
     if (hsb)
       XtVaSetValues (hsb,
 
     if (hsb)
       XtVaSetValues (hsb,


@@ -184,9 +163,7 @@ int wxFileDialog::ShowModal()
     //  static char fileBuf[512];
     Widget parentWidget = (Widget) 0;
     if (m_parent)
     //  static char fileBuf[512];
     Widget parentWidget = (Widget) 0;
     if (m_parent)

-    {

         parentWidget = (Widget) m_parent->GetTopWidget();
         parentWidget = (Widget) m_parent->GetTopWidget();

-    }

     else
         parentWidget = (Widget) wxTheApp->GetTopLevelWidget();
     // prepare the arg list
     else
         parentWidget = (Widget) wxTheApp->GetTopLevelWidget();
     // prepare the arg list


@@ -221,7 +198,9 @@ int wxFileDialog::ShowModal()
     Widget shell = XtParent(fileSel);
 
     if (!m_message.IsNull())
     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("");
 
 
     wxString entirePath("");
 


@@ -238,20 +217,17 @@ int wxFileDialog::ShowModal()
         entirePath = m_fileName;
     }
 
         entirePath = m_fileName;
     }
 

-    if (entirePath != "")
-    {
-        XmTextSetString(selectionWidget, (char*) (const char*) entirePath);
-    }
-

     if (m_wildCard != "")
     {
     if (m_wildCard != "")
     {

-        wxString filter("");
+        // return something understandable by Motif
+        wxString wildCard = ParseWildCard( m_wildCard );
+        wxString filter;

         if (m_dir != "")
         if (m_dir != "")

-            filter = m_dir + wxString("/") + m_wildCard;
+            filter = m_dir + wxString("/") + wildCard;

         else
         else

-            filter = m_wildCard;
+            filter = wildCard;

 
 

-        XmTextSetString(filterWidget, (char*) (const char*) filter);
+        XmTextSetString(filterWidget, wxConstCast(filter.c_str(), char));

         XmFileSelectionDoSearch(fileSel, NULL);
     }
 
         XmFileSelectionDoSearch(fileSel, NULL);
     }
 


@@ -259,18 +235,23 @@ int wxFileDialog::ShowModal()
     // file selector on Solaris 1.5.1.
     if ( m_dir != "" )
     {
     // 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,
 
         XtVaSetValues (fileSel,

-            XmNdirectory, thePath,
+            XmNdirectory, thePath(),

             NULL);
             NULL);

+    }

 
 

-        XmStringFree(thePath);
+    if (entirePath != "")
+    {
+        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);

 
     //#if XmVersion > 1000
     // I'm not sure about what you mean with XmVersion.
 
     //#if XmVersion > 1000
     // I'm not sure about what you mean with XmVersion.


@@ -287,9 +268,9 @@ int wxFileDialog::ShowModal()
         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
 #endif
         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);
 
     wxChangeListBoxColours(this, dirListWidget);
     wxChangeListBoxColours(this, fileListWidget);


@@ -302,28 +283,25 @@ int wxFileDialog::ShowModal()
     wxEndBusyCursor();
 
     XtAddGrab(XtParent(fileSel), TRUE, FALSE);
     wxEndBusyCursor();
 
     XtAddGrab(XtParent(fileSel), TRUE, FALSE);

+    XtAppContext context = (XtAppContext) wxTheApp->GetAppContext();

     XEvent event;
     while (!m_fileSelectorReturned)
     {
     XEvent event;
     while (!m_fileSelectorReturned)
     {

-        XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
+        XtAppNextEvent(context, &event);
+        XtDispatchEvent(&event);

     }
     XtRemoveGrab(XtParent(fileSel));
 
     }
     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
     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);
 
     m_path = m_fileSelectorAnswer;
     m_fileName = wxFileNameFromPath(m_fileSelectorAnswer);


@@ -335,39 +313,3 @@ int wxFileDialog::ShowModal()
         return wxID_OK;
 }
 
         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);
-}
-
-