Empty string corrections.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index e54cb2d4d652020d3d34b8b7e027733d0c077895..b9925678ba3942d341083b3016bb17f9e776055d 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -60,21 +60,21 @@ IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 #define wxFSB_HEIGHT               500
 
 
 #define wxFSB_HEIGHT               500
 
 

-wxString wxFileDialog::m_fileSelectorAnswer = "";
+wxString wxFileDialog::m_fileSelectorAnswer = wxEmptyString;

 bool wxFileDialog::m_fileSelectorReturned = false;
 
 static void wxFileSelClose(Widget WXUNUSED(w),
                            void* WXUNUSED(client_data),
                            XmAnyCallbackStruct *WXUNUSED(call_data))
 {
 bool wxFileDialog::m_fileSelectorReturned = false;
 
 static void wxFileSelClose(Widget WXUNUSED(w),
                            void* WXUNUSED(client_data),
                            XmAnyCallbackStruct *WXUNUSED(call_data))
 {

-    wxFileDialog::m_fileSelectorAnswer = "";
+    wxFileDialog::m_fileSelectorAnswer = wxEmptyString;

     wxFileDialog::m_fileSelectorReturned = true;
 }
 
 void wxFileSelCancel( Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data),
                      XmFileSelectionBoxCallbackStruct *WXUNUSED(cbs) )
 {
     wxFileDialog::m_fileSelectorReturned = true;
 }
 
 void wxFileSelCancel( Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data),
                      XmFileSelectionBoxCallbackStruct *WXUNUSED(cbs) )
 {

-    wxFileDialog::m_fileSelectorAnswer = "";
+    wxFileDialog::m_fileSelectorAnswer = wxEmptyString;

     wxFileDialog::m_fileSelectorReturned = true;
 }
 
     wxFileDialog::m_fileSelectorReturned = true;
 }
 


@@ -82,7 +82,7 @@ void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSel
 {
     char *filename = NULL;
     if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) {
 {
     char *filename = NULL;
     if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) {

-        wxFileDialog::m_fileSelectorAnswer = "";
+        wxFileDialog::m_fileSelectorAnswer = wxEmptyString;

         wxFileDialog::m_fileSelectorReturned = true;
     } else {
         if (filename) {
         wxFileDialog::m_fileSelectorReturned = true;
     } else {
         if (filename) {


@@ -240,12 +240,12 @@ int wxFileDialog::ShowModal()
                       XmNtitle, wxConstCast(m_message.c_str(), char),
                       NULL);
 
                       XmNtitle, wxConstCast(m_message.c_str(), char),
                       NULL);
 

-    if (m_wildCard != "")
+    if (!m_wildCard.empty())

     {
         // return something understandable by Motif
         wxString wildCard = ParseWildCard( m_wildCard );
         wxString filter;
     {
         // return something understandable by Motif
         wxString wildCard = ParseWildCard( m_wildCard );
         wxString filter;

-        if (m_dir != "")
+        if (!m_dir.empty())

             filter = m_dir + wxString("/") + wildCard;
         else
             filter = wildCard;
             filter = m_dir + wxString("/") + wildCard;
         else
             filter = wildCard;


@@ -256,7 +256,7 @@ int wxFileDialog::ShowModal()
 
     // Suggested by Terry Gitnick, 16/9/97, because of change in Motif
     // file selector on Solaris 1.5.1.
 
     // Suggested by Terry Gitnick, 16/9/97, because of change in Motif
     // file selector on Solaris 1.5.1.

-    if ( m_dir != "" )
+    if ( !m_dir.empty() )

     {
         wxXmString thePath( m_dir );
 
     {
         wxXmString thePath( m_dir );
 


@@ -265,9 +265,9 @@ int wxFileDialog::ShowModal()
             NULL);
     }
 
             NULL);
     }
 

-    wxString entirePath("");
+    wxString entirePath;

 
 

-    if (m_dir != "")
+    if (!m_dir.empty())

     {
         entirePath = m_dir + wxString("/") + m_fileName;
     }
     {
         entirePath = m_dir + wxString("/") + m_fileName;
     }


@@ -276,7 +276,7 @@ int wxFileDialog::ShowModal()
         entirePath = m_fileName;
     }
 
         entirePath = m_fileName;
     }
 

-    if (entirePath != "")
+    if (!entirePath.empty())

     {
         XmTextSetString(selectionWidget,
                         wxConstCast(entirePath.c_str(), char));
     {
         XmTextSetString(selectionWidget,
                         wxConstCast(entirePath.c_str(), char));


@@ -312,7 +312,7 @@ int wxFileDialog::ShowModal()
 
     XtManageChild(fileSel);
 
 
     XtManageChild(fileSel);
 

-    m_fileSelectorAnswer = "";
+    m_fileSelectorAnswer = wxEmptyString;

     m_fileSelectorReturned = false;
 
     wxEndBusyCursor();
     m_fileSelectorReturned = false;
 
     wxEndBusyCursor();


@@ -338,9 +338,8 @@ int wxFileDialog::ShowModal()
     m_fileName = wxFileNameFromPath(m_fileSelectorAnswer);
     m_dir = wxPathOnly(m_path);
 
     m_fileName = wxFileNameFromPath(m_fileSelectorAnswer);
     m_dir = wxPathOnly(m_path);
 

-    if (m_fileName == "")
+    if (m_fileName.empty())

         return wxID_CANCEL;
     else
         return wxID_OK;
 }
         return wxID_CANCEL;
     else
         return wxID_OK;
 }

-