Fixed some warnings

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

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 6ab59b0205aa015ee436aad35e1b761862f45fa1..f1f2970e52f25d60dc5212d9cb5147721c9389c5 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -12,12 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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/filedlg.h"
 
 #ifndef WX_PRECOMP
 #include "wx/filedlg.h"
 
 #ifndef WX_PRECOMP


@@ -29,6 +23,7 @@
 
 #include "wx/tokenzr.h"
 #include "wx/stockitem.h"
 
 #include "wx/tokenzr.h"
 #include "wx/stockitem.h"

+#include "wx/testing.h"

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


@@ -94,21 +89,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 );


@@ -120,7 +114,6 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
              :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)
 {
                            long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
              :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)
 {

-    m_filterIndex = 1;

 }
 
 static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)
 }
 
 static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)


@@ -159,6 +152,8 @@ static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)
 
 int wxFileDialog::ShowModal()
 {
 
 int wxFileDialog::ShowModal()
 {

+    WX_TESTING_SHOW_MODAL_HOOK();
+

     wxBeginBusyCursor();
 
     //  static char fileBuf[512];
     wxBeginBusyCursor();
 
     //  static char fileBuf[512];


@@ -172,9 +167,9 @@ 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, (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++;
 
         XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++;
         XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++;


@@ -235,9 +230,9 @@ int wxFileDialog::ShowModal()
 
     Widget shell = XtParent(fileSel);
 
 
     Widget shell = XtParent(fileSel);
 

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

         XtVaSetValues(shell,
         XtVaSetValues(shell,

-                      XmNtitle, wxConstCast(m_message.mb_str(), char),
+                      XmNtitle, (const char*)m_message.mb_str(),

                       NULL);
 
     if (!m_wildCard.empty())
                       NULL);
 
     if (!m_wildCard.empty())


@@ -250,7 +245,7 @@ int wxFileDialog::ShowModal()
         else
             filter = wildCard;
 
         else
             filter = wildCard;
 

-        XmTextSetString(filterWidget, wxConstCast(filter.mb_str(), char));
+        XmTextSetString(filterWidget, filter.char_str());

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


@@ -278,8 +273,7 @@ int wxFileDialog::ShowModal()
 
     if (!entirePath.empty())
     {
 
     if (!entirePath.empty())
     {

-        XmTextSetString(selectionWidget,
-                        wxConstCast(entirePath.mb_str(), char));
+        XmTextSetString(selectionWidget, entirePath.char_str());

     }
 
     XtAddCallback(fileSel, XmNcancelCallback,
     }
 
     XtAddCallback(fileSel, XmNcancelCallback,