X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/455f7c8205e5dc29d99026b158ae0a394dccc839..97e49559fb0e1dfc43d66e8784ec47182f5507e9:/src/motif/filedlg.cpp

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 490f92fb23..e2da28904a 100644
--- 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 )
 {
-#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);
-    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
-    wxStringTokenizer tok2( wildFilters[0], _T(";") );
+    wxStringTokenizer tok2( wildFilters[0], wxT(";") );
     wxString wildcard = tok2.GetNextToken();
 
     wxCHECK_MSG( tok2.CountTokens() <= 1, wildcard, msg );
@@ -168,7 +167,7 @@ int wxFileDialog::ShowModal()
 
     if (m_backgroundColour.Ok())
     {
-        wxComputeColours (dpy, & m_backgroundColour, (wxColour*) NULL);
+        wxComputeColours (dpy, & m_backgroundColour, NULL);
 
         XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++;
         XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++;
@@ -229,7 +228,7 @@ int wxFileDialog::ShowModal()
 
     Widget shell = XtParent(fileSel);
 
-    if (!m_message.IsNull())
+    if ( !m_message.empty() )
         XtVaSetValues(shell,
                       XmNtitle, (const char*)m_message.mb_str(),
                       NULL);