Applied patch [ 743471 ] wxSplitter::Unsplit fix

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

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 101def7118c368344b5e9200e3e0766e1232e075..ed2ca5e9c49a4018232b8f7e41b41231847aaf29 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -13,6 +13,12 @@
 #pragma implementation "filedlg.h"
 #endif
 
 #pragma implementation "filedlg.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtParent XTPARENT
+#define XtWindow XTWINDOW
+#endif
+

 #include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"


@@ -20,6 +26,7 @@
 #include "wx/intl.h"
 #include "wx/app.h"
 #include "wx/settings.h"
 #include "wx/intl.h"
 #include "wx/app.h"
 #include "wx/settings.h"

+#include "wx/tokenzr.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -40,9 +47,7 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)

-#endif

 
 #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


@@ -114,6 +119,14 @@ wxString wxFileSelectorEx(const char *title,
 wxString wxFileDialog::m_fileSelectorAnswer = "";
 bool wxFileDialog::m_fileSelectorReturned = FALSE;
 
 wxString wxFileDialog::m_fileSelectorAnswer = "";
 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;
+}
+

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


@@ -136,6 +149,28 @@ 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)


@@ -153,11 +188,13 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 
 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;


@@ -169,9 +206,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,


@@ -190,9 +227,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


@@ -227,7 +262,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("");
 


@@ -244,20 +281,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);
     }
 


@@ -265,18 +299,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.


@@ -293,9 +332,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);


@@ -308,28 +347,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);


@@ -345,7 +381,7 @@ int wxFileDialog::ShowModal()
 static wxString
 wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
 static wxString
 wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {

-    char *ext = (char *)extension;
+    char *ext = wxConstCast(extension, char);

 
     wxString prompt;
     wxString str;
 
     wxString prompt;
     wxString str;