Add some version checks to help compiling on OSX.

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

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 974b18b796ff56e3805dc05c66e1dbaed7da27e5..cf105fe9be85d72a6b4d76fbfe52591e227501d5 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -88,21 +88,20 @@ void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSel
 
 static wxString ParseWildCard( const wxString& wild )
 {
 
 static wxString ParseWildCard( const wxString& wild )
 {

-#ifdef __WXDEBUG__
-    static const wxChar* msg =
-        _T("Motif file dialog does not understand this ")
-        _T("wildcard syntax");
+#if wxDEBUG_LEVEL
+    static const char *msg =
+        "Motif file dialog does not understand this wildcard syntax";

 #endif
 
     wxArrayString wildDescriptions, wildFilters;
     const size_t count = wxParseCommonDialogsFilter(wild,
                                                     wildDescriptions,
                                                     wildFilters);
 #endif
 
     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( count, wxT("*.*"), wxT("wxFileDialog: bad wildcard string") );
+    wxCHECK_MSG( count == 1, wxT("*.*"), msg );

 
     // check for *.txt;*.rtf
 
     // check for *.txt;*.rtf

-    wxStringTokenizer tok2( wildFilters[0], _T(";") );
+    wxStringTokenizer tok2( wildFilters[0], wxT(";") );

     wxString wildcard = tok2.GetNextToken();
 
     wxCHECK_MSG( tok2.CountTokens() <= 1, wildcard, msg );
     wxString wildcard = tok2.GetNextToken();
 
     wxCHECK_MSG( tok2.CountTokens() <= 1, wildcard, msg );


@@ -166,7 +165,7 @@ int wxFileDialog::ShowModal()
     Arg args[10];
     int ac = 0;
 
     Arg args[10];
     int ac = 0;
 

-    if (m_backgroundColour.Ok())
+    if (m_backgroundColour.IsOk())

     {
         wxComputeColours (dpy, & m_backgroundColour, NULL);
 
     {
         wxComputeColours (dpy, & m_backgroundColour, NULL);
 


@@ -229,7 +228,7 @@ int wxFileDialog::ShowModal()
 
     Widget shell = XtParent(fileSel);
 
 
     Widget shell = XtParent(fileSel);
 

-    if (!m_message.IsNull())
+    if ( !m_message.empty() )

         XtVaSetValues(shell,
                       XmNtitle, (const char*)m_message.mb_str(),
                       NULL);
         XtVaSetValues(shell,
                       XmNtitle, (const char*)m_message.mb_str(),
                       NULL);