fixed MSVC6 warning

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 268fdd05f16faaae55da1706a059083d401f52cc..db74590edfca571ae6c3b5369b5de519787d7f3a 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -19,7 +19,7 @@
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
 // Some older compilers (such as EMX) cannot handle
-// #pragma interface/implementation correctly, iff 
+// #pragma interface/implementation correctly, iff
 // #pragma implementation is used in _two_ translation
 // units (as created by e.g. event.cpp compiled for
 // libwx_base and event.cpp compiled for libwx_gui_core).
@@ -322,12 +322,12 @@ bool wxGetEmailAddress(wxChar *address, int maxSize)
 {
     wxString email = wxGetEmailAddress();
     if ( !email )
-        return FALSE;
+        return false;
 
     wxStrncpy(address, email, maxSize - 1);
     address[maxSize - 1] = wxT('\0');
 
-    return TRUE;
+    return true;
 }
 
 wxString wxGetEmailAddress()
@@ -335,10 +335,10 @@ wxString wxGetEmailAddress()
     wxString email;
 
     wxString host = wxGetFullHostName();
-    if ( !!host )
+    if ( !host.IsEmpty() )
     {
         wxString user = wxGetUserId();
-        if ( !!user )
+        if ( !user.IsEmpty() )
         {
             email << user << wxT('@') << host;
         }
@@ -447,18 +447,18 @@ wxString wxGetCurrentDir()
 
 // wxDoExecuteWithCapture() helper: reads an entire stream into one array
 //
-// returns TRUE if ok, FALSE if error
+// returns true if ok, false if error
 #if wxUSE_STREAMS
 static bool ReadAll(wxInputStream *is, wxArrayString& output)
 {
-    wxCHECK_MSG( is, FALSE, _T("NULL stream in wxExecute()?") );
+    wxCHECK_MSG( is, false, _T("NULL stream in wxExecute()?") );
 
     // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
     is->Reset();
 
     wxTextInputStream tis(*is);
 
-    bool cont = TRUE;
+    bool cont = true;
     while ( cont )
     {
         wxString line = tis.ReadLine();
@@ -467,7 +467,7 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output)
 
         if ( !*is )
         {
-            cont = FALSE;
+            cont = false;
         }
         else
         {
@@ -538,7 +538,7 @@ bool wxYield()
 
 bool wxYieldIfNeeded()
 {
-    return wxTheApp && wxTheApp->Yield(TRUE);
+    return wxTheApp && wxTheApp->Yield(true);
 }
 
 #endif // wxUSE_BASE
@@ -660,7 +660,7 @@ wxFindWindowByName (const wxString& name, wxWindow * parent)
     return wxWindow::FindWindowByName( name, parent );
 }
 
-// Returns menu item id or -1 if none.
+// Returns menu item id or wxNOT_FOUND if none.
 int
 wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
 {
@@ -670,7 +670,7 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
       return menuBar->FindMenuItem (menuString, itemString);
 #endif // wxUSE_MENUS
 
-  return -1;
+  return wxNOT_FOUND;
 }
 
 // Try to find the deepest child that contains 'pt'.
@@ -788,10 +788,18 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
 
 wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
                         const wxString& defaultValue, wxWindow *parent,
-                        int x, int y, bool WXUNUSED(centre) )
+                        wxCoord x, wxCoord y, bool centre )
 {
     wxString str;
-    wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
+    long style = wxTextEntryDialogStyle;
+
+    if (centre)
+        style |= wxCENTRE;
+    else
+        style &= ~wxCENTRE;
+
+    wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y));
+
     if (dialog.ShowModal() == wxID_OK)
     {
         str = dialog.GetValue();
@@ -823,7 +831,7 @@ wxString wxGetPasswordFromUser(const wxString& message,
 wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
 {
     wxColourData data;
-    data.SetChooseFull(TRUE);
+    data.SetChooseFull(true);
     if ( colInit.Ok() )
     {
         data.SetColour((wxColour &)colInit); // const_cast
@@ -943,7 +951,7 @@ bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)
 #ifndef __WXGTK__
 bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 {
-    return TRUE;    // detectable auto-repeat is the only mode MSW supports
+    return true;    // detectable auto-repeat is the only mode MSW supports
 }
 #endif // !wxGTK