Metrowerks Objective-C++ is more strict about types than Apple's.

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 2fd1c86901ba2a3088de2710faa9f59371cfe45b..09369b63f3151bef006dc88747bd6543bdb3d0b7 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
 
 #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).
 // #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).


@@ -95,7 +95,7 @@
     #include <sys/stat.h>
 #endif
 
     #include <sys/stat.h>
 #endif
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

     #include "wx/msw/private.h"
 #endif
 
     #include "wx/msw/private.h"
 #endif
 


@@ -119,7 +119,7 @@
 wxChar *
 copystring (const wxChar *s)
 {
 wxChar *
 copystring (const wxChar *s)
 {

-  if (s == NULL) s = wxT("");
+  if (s == NULL) s = wxEmptyString;

   size_t len = wxStrlen (s) + 1;
 
   wxChar *news = new wxChar[len];
   size_t len = wxStrlen (s) + 1;
 
   wxChar *news = new wxChar[len];


@@ -266,6 +266,11 @@ wxString wxNow()
 #endif
 }
 
 #endif
 }
 

+void wxUsleep(unsigned long milliseconds)
+{
+    wxMilliSleep(milliseconds);
+}
+

 const wxChar *wxGetInstallPrefix()
 {
     wxString prefix;
 const wxChar *wxGetInstallPrefix()
 {
     wxString prefix;


@@ -276,19 +281,14 @@ const wxChar *wxGetInstallPrefix()
 #ifdef wxINSTALL_PREFIX
     return wxT(wxINSTALL_PREFIX);
 #else
 #ifdef wxINSTALL_PREFIX
     return wxT(wxINSTALL_PREFIX);
 #else

-    return wxT("");
+    return wxEmptyString;

 #endif
 }
 
 wxString wxGetDataDir()
 {
 #endif
 }
 
 wxString wxGetDataDir()
 {

-    wxString format = wxGetInstallPrefix();
-    format <<  wxFILE_SEP_PATH
-           << wxT("share") << wxFILE_SEP_PATH
-           << wxT("wx") << wxFILE_SEP_PATH
-           << wxT("%i.%i");
-    wxString dir;
-    dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
+    wxString dir = wxGetInstallPrefix();
+    dir <<  wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx");

     return dir;
 }
 
     return dir;
 }
 


@@ -317,12 +317,12 @@ bool wxGetEmailAddress(wxChar *address, int maxSize)
 {
     wxString email = wxGetEmailAddress();
     if ( !email )
 {
     wxString email = wxGetEmailAddress();
     if ( !email )

-        return FALSE;
+        return false;

 
     wxStrncpy(address, email, maxSize - 1);
     address[maxSize - 1] = wxT('\0');
 
 
     wxStrncpy(address, email, maxSize - 1);
     address[maxSize - 1] = wxT('\0');
 

-    return TRUE;
+    return true;

 }
 
 wxString wxGetEmailAddress()
 }
 
 wxString wxGetEmailAddress()


@@ -330,10 +330,10 @@ wxString wxGetEmailAddress()
     wxString email;
 
     wxString host = wxGetFullHostName();
     wxString email;
 
     wxString host = wxGetFullHostName();

-    if ( !!host )
+    if ( !host.empty() )

     {
         wxString user = wxGetUserId();
     {
         wxString user = wxGetUserId();

-        if ( !!user )
+        if ( !user.empty() )

         {
             email << user << wxT('@') << host;
         }
         {
             email << user << wxT('@') << host;
         }


@@ -442,18 +442,18 @@ wxString wxGetCurrentDir()
 
 // wxDoExecuteWithCapture() helper: reads an entire stream into one array
 //
 
 // 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)
 {
 #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);
 
 
     // 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();
     while ( cont )
     {
         wxString line = tis.ReadLine();


@@ -462,7 +462,7 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output)
 
         if ( !*is )
         {
 
         if ( !*is )
         {

-            cont = FALSE;
+            cont = false;

         }
         else
         {
         }
         else
         {


@@ -479,13 +479,14 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output)
 // public versions of wxExecute() below
 static long wxDoExecuteWithCapture(const wxString& command,
                                    wxArrayString& output,
 // public versions of wxExecute() below
 static long wxDoExecuteWithCapture(const wxString& command,
                                    wxArrayString& output,

-                                   wxArrayString* error)
+                                   wxArrayString* error,
+                                   int flags)

 {
     // create a wxProcess which will capture the output
     wxProcess *process = new wxProcess;
     process->Redirect();
 
 {
     // create a wxProcess which will capture the output
     wxProcess *process = new wxProcess;
     process->Redirect();
 

-    long rc = wxExecute(command, wxEXEC_SYNC, process);
+    long rc = wxExecute(command, wxEXEC_SYNC | flags, process);

 
 #if wxUSE_STREAMS
     if ( rc != -1 )
 
 #if wxUSE_STREAMS
     if ( rc != -1 )


@@ -500,23 +501,27 @@ static long wxDoExecuteWithCapture(const wxString& command,
         }
 
     }
         }
 
     }

-#endif // wxUSE_STREAMS
+#else
+    wxUnusedVar(output);
+    wxUnusedVar(error);
+#endif // wxUSE_STREAMS/!wxUSE_STREAMS

 
     delete process;
 
     return rc;
 }
 
 
     delete process;
 
     return rc;
 }
 

-long wxExecute(const wxString& command, wxArrayString& output)
+long wxExecute(const wxString& command, wxArrayString& output, int flags)

 {
 {

-    return wxDoExecuteWithCapture(command, output, NULL);
+    return wxDoExecuteWithCapture(command, output, NULL, flags);

 }
 
 long wxExecute(const wxString& command,
                wxArrayString& output,
 }
 
 long wxExecute(const wxString& command,
                wxArrayString& output,

-               wxArrayString& error)
+               wxArrayString& error,
+               int flags)

 {
 {

-    return wxDoExecuteWithCapture(command, output, &error);
+    return wxDoExecuteWithCapture(command, output, &error, flags);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -530,7 +535,7 @@ bool wxYield()
 
 bool wxYieldIfNeeded()
 {
 
 bool wxYieldIfNeeded()
 {

-    return wxTheApp && wxTheApp->Yield(TRUE);
+    return wxTheApp && wxTheApp->Yield(true);

 }
 
 #endif // wxUSE_BASE
 }
 
 #endif // wxUSE_BASE


@@ -544,10 +549,13 @@ bool wxYieldIfNeeded()
 // Id generation
 static long wxCurrentId = 100;
 
 // Id generation
 static long wxCurrentId = 100;
 

-long
-wxNewId (void)
+long wxNewId()

 {
 {

-  return wxCurrentId++;
+    // skip the part of IDs space that contains hard-coded values:
+    if (wxCurrentId == wxID_LOWEST)
+        wxCurrentId = wxID_HIGHEST + 1;
+
+    return wxCurrentId++;

 }
 
 long
 }
 
 long


@@ -652,7 +660,7 @@ wxFindWindowByName (const wxString& name, wxWindow * parent)
     return wxWindow::FindWindowByName( name, 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)
 {
 int
 wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
 {


@@ -662,7 +670,7 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
       return menuBar->FindMenuItem (menuString, itemString);
 #endif // wxUSE_MENUS
 
       return menuBar->FindMenuItem (menuString, itemString);
 #endif // wxUSE_MENUS
 

-  return -1;
+  return wxNOT_FOUND;

 }
 
 // Try to find the deepest child that contains 'pt'.
 }
 
 // Try to find the deepest child that contains 'pt'.


@@ -780,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,
 
 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;
 {
     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();
     if (dialog.ShowModal() == wxID_OK)
     {
         str = dialog.GetValue();


@@ -795,11 +811,19 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
 wxString wxGetPasswordFromUser(const wxString& message,
                                const wxString& caption,
                                const wxString& defaultValue,
 wxString wxGetPasswordFromUser(const wxString& message,
                                const wxString& caption,
                                const wxString& defaultValue,

-                               wxWindow *parent)
+                               wxWindow *parent,
+                               wxCoord x, wxCoord y, bool centre )

 {
     wxString str;
 {
     wxString str;

-    wxTextEntryDialog dialog(parent, message, caption, defaultValue,
-                             wxOK | wxCANCEL | wxTE_PASSWORD);
+    long style = wxTextEntryDialogStyle;
+
+    if (centre)
+        style |= wxCENTRE;
+    else
+        style &= ~wxCENTRE;
+
+    wxPasswordEntryDialog dialog(parent, message, caption, defaultValue,
+                             style, wxPoint(x, y));

     if ( dialog.ShowModal() == wxID_OK )
     {
         str = dialog.GetValue();
     if ( dialog.ShowModal() == wxID_OK )
     {
         str = dialog.GetValue();


@@ -815,7 +839,7 @@ wxString wxGetPasswordFromUser(const wxString& message,
 wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
 {
     wxColourData data;
 wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
 {
     wxColourData data;

-    data.SetChooseFull(TRUE);
+    data.SetChooseFull(true);

     if ( colInit.Ok() )
     {
         data.SetColour((wxColour &)colInit); // const_cast
     if ( colInit.Ok() )
     {
         data.SetColour((wxColour &)colInit); // const_cast


@@ -935,7 +959,7 @@ bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)
 #ifndef __WXGTK__
 bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 {
 #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
 
 }
 #endif // !wxGTK