X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..dde4740fe1dddbb2738a0afd054f493cb0dd67d1:/src/motif/filedlg.cpp?ds=sidebyside

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index c244836db6..1945cadf3a 100644
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -60,21 +60,21 @@ IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 
 
 wxString wxFileDialog::m_fileSelectorAnswer = "";
-bool wxFileDialog::m_fileSelectorReturned = FALSE;
+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_fileSelectorReturned = true;
 }
 
 void wxFileSelCancel( Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data),
                      XmFileSelectionBoxCallbackStruct *WXUNUSED(cbs) )
 {
     wxFileDialog::m_fileSelectorAnswer = "";
-    wxFileDialog::m_fileSelectorReturned = TRUE;
+    wxFileDialog::m_fileSelectorReturned = true;
 }
 
 void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSelectionBoxCallbackStruct *cbs)
@@ -82,13 +82,13 @@ void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSel
     char *filename = NULL;
     if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) {
         wxFileDialog::m_fileSelectorAnswer = "";
-        wxFileDialog::m_fileSelectorReturned = TRUE;
+        wxFileDialog::m_fileSelectorReturned = true;
     } else {
         if (filename) {
             wxFileDialog::m_fileSelectorAnswer = filename;
             XtFree(filename);
         }
-        wxFileDialog::m_fileSelectorReturned = TRUE;
+        wxFileDialog::m_fileSelectorReturned = true;
     }
 }
 
@@ -100,18 +100,19 @@ 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,
@@ -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,
@@ -278,11 +279,11 @@ int wxFileDialog::ShowModal()
     XtManageChild(fileSel);
 
     m_fileSelectorAnswer = "";
-    m_fileSelectorReturned = FALSE;
+    m_fileSelectorReturned = false;
 
     wxEndBusyCursor();
 
-    XtAddGrab(XtParent(fileSel), TRUE, FALSE);
+    XtAddGrab(XtParent(fileSel), True, False);
     XtAppContext context = (XtAppContext) wxTheApp->GetAppContext();
     XEvent event;
     while (!m_fileSelectorReturned)