Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 48e1549e7e1d0a0d0de2564f068cdb19b3b87ff1..712b38883f1deeb27031b078bd58d9da94a740c2 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -52,6 +52,7 @@
 #include "wx/uri.h"
 #include "wx/mimetype.h"
 #include "wx/config.h"
 #include "wx/uri.h"
 #include "wx/mimetype.h"
 #include "wx/config.h"

+#include "wx/versioninfo.h"

 
 #if defined(__WXWINCE__) && wxUSE_DATETIME
     #include "wx/datetime.h"
 
 #if defined(__WXWINCE__) && wxUSE_DATETIME
     #include "wx/datetime.h"


@@ -548,8 +549,10 @@ wxString wxGetCurrentDir()
 // ----------------------------------------------------------------------------
 
 #ifdef __WXOSX__
 // ----------------------------------------------------------------------------
 
 #ifdef __WXOSX__

+#if wxOSX_USE_COCOA_OR_CARBON

     #include <crt_externs.h>
 #endif
     #include <crt_externs.h>
 #endif

+#endif

 
 bool wxGetEnvMap(wxEnvVariableHashMap *map)
 {
 
 bool wxGetEnvMap(wxEnvVariableHashMap *map)
 {


@@ -557,7 +560,12 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
 
 #if defined(__VISUALC__)
     wxChar **env = _tenviron;
 
 #if defined(__VISUALC__)
     wxChar **env = _tenviron;

+#elif defined(__VMS)
+   // Now this routine wil give false for OpenVMS
+   // TODO : should we do something with logicals?
+    char **env=NULL;

 #elif defined(__WXOSX__)
 #elif defined(__WXOSX__)

+#if wxOSX_USE_COCOA_OR_CARBON

     // Under Mac shared libraries don't have access to the global environ
     // variable so use this Mac-specific function instead as advised by
     // environ(7) under Darwin
     // Under Mac shared libraries don't have access to the global environ
     // variable so use this Mac-specific function instead as advised by
     // environ(7) under Darwin


@@ -565,9 +573,28 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
     if ( !penv )
         return false;
     char **env = *penv;
     if ( !penv )
         return false;
     char **env = *penv;

+#else
+    char **env=NULL;
+    // todo translate NSProcessInfo environment into map
+#endif

 #else // non-MSVC non-Mac
     // Not sure if other compilers have _tenviron so use the (more standard)
     // ANSI version only for them.
 #else // non-MSVC non-Mac
     // Not sure if other compilers have _tenviron so use the (more standard)
     // ANSI version only for them.

+
+    // Both POSIX and Single UNIX Specification say that this variable must
+    // exist but not that it must be declared anywhere and, indeed, it's not
+    // declared in several common systems (some BSDs, Solaris with native CC)
+    // so we (re)declare it ourselves to deal with these cases. However we do
+    // not do this under MSW where there can be DLL-related complications, i.e.
+    // the variable might be DLL-imported or not. Luckily we don't have to
+    // worry about this as all MSW compilers do seem to define it in their
+    // standard headers anyhow so we can just rely on already having the
+    // correct declaration. And if this turns out to be wrong, we can always
+    // add a configure test checking whether it is declared later.
+#ifndef __WXMSW__
+    extern char **environ;
+#endif // !__WXMSW__
+

     char **env = environ;
 #endif
 
     char **env = environ;
 #endif
 


@@ -796,8 +823,8 @@ typedef struct
       smaller partition.  This *guarantees* no more than log (n)
       stack size is needed (actually O(1) in this case)!  */
 
       smaller partition.  This *guarantees* no more than log (n)
       stack size is needed (actually O(1) in this case)!  */
 

-void wxQsort(void *const pbase, size_t total_elems,
-                             size_t size, CMPFUNCDATA cmp, const void* user_data)
+void wxQsort(void* pbase, size_t total_elems,
+             size_t size, wxSortCallback cmp, const void* user_data)

 {
   register char *base_ptr = (char *) pbase;
   const size_t max_thresh = MAX_THRESH * size;
 {
   register char *base_ptr = (char *) pbase;
   const size_t max_thresh = MAX_THRESH * size;


@@ -1345,6 +1372,8 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
             return wxNO;
         case wxID_CANCEL:
             return wxCANCEL;
             return wxNO;
         case wxID_CANCEL:
             return wxCANCEL;

+        case wxID_HELP:
+            return wxHELP;

     }
 
     wxFAIL_MSG( wxT("unexpected return code from wxMessageDialog") );
     }
 
     wxFAIL_MSG( wxT("unexpected return code from wxMessageDialog") );


@@ -1352,7 +1381,7 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
     return wxCANCEL;
 }
 
     return wxCANCEL;
 }
 

-void wxInfoMessageBox(wxWindow* parent)
+wxVersionInfo wxGetLibraryVersionInfo()

 {
     // don't translate these strings, they're for diagnostics purposes only
     wxString msg;
 {
     // don't translate these strings, they're for diagnostics purposes only
     wxString msg;


@@ -1385,7 +1414,20 @@ void wxInfoMessageBox(wxWindow* parent)
                             GTK_MICRO_VERSION);
 #endif // __WXGTK__
 
                             GTK_MICRO_VERSION);
 #endif // __WXGTK__
 

-    msg += wxS("\nCopyright (c) 1995-2010 wxWidgets team");
+    return wxVersionInfo(wxS("wxWidgets"),
+                         wxMAJOR_VERSION,
+                         wxMINOR_VERSION,
+                         wxRELEASE_NUMBER,
+                         msg,
+                         wxS("Copyright (c) 1995-2011 wxWidgets team"));
+}
+
+void wxInfoMessageBox(wxWindow* parent)
+{
+    wxVersionInfo info = wxGetLibraryVersionInfo();
+    wxString msg = info.ToString();
+
+    msg << wxS("\n") << info.GetCopyright();

 
     wxMessageBox(msg, wxT("wxWidgets information"),
                  wxICON_INFORMATION | wxOK,
 
     wxMessageBox(msg, wxT("wxWidgets information"),
                  wxICON_INFORMATION | wxOK,


@@ -1507,7 +1549,7 @@ wxColour wxGetColourFromUser(wxWindow *parent,
 wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
 {
     wxFontData data;
 wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
 {
     wxFontData data;

-    if ( fontInit.Ok() )
+    if ( fontInit.IsOk() )

     {
         data.SetInitialFont(fontInit);
     }
     {
         data.SetInitialFont(fontInit);
     }


@@ -1538,6 +1580,12 @@ void wxEnableTopLevelWindows(bool enable)
         node->GetData()->Enable(enable);
 }
 
         node->GetData()->Enable(enable);
 }
 

+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+
+// defined in evtloop.mm
+
+#else
+

 wxWindowDisabler::wxWindowDisabler(bool disable)
 {
     m_disabled = disable;
 wxWindowDisabler::wxWindowDisabler(bool disable)
 {
     m_disabled = disable;


@@ -1600,6 +1648,8 @@ wxWindowDisabler::~wxWindowDisabler()
     delete m_winDisabled;
 }
 
     delete m_winDisabled;
 }
 

+#endif
+

 // Yield to other apps/messages and disable user input to all windows except
 // the given one
 bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)
 // Yield to other apps/messages and disable user input to all windows except
 // the given one
 bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)