X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9837e4693de73bc10087e6709e9cdd6e3834855..9572bf1d442006beba3528dc00c3fc05eb523c24:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 3c6d04dcd1..53791d386f 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -110,7 +110,7 @@ // ============================================================================ // Array used in DecToHex conversion routine. -static wxChar hexArray[] = wxT("0123456789ABCDEF"); +static const wxChar hexArray[] = wxT("0123456789ABCDEF"); // Convert 2-digit hex number to decimal int wxHexToDec(const wxString& buf) @@ -355,8 +355,7 @@ void wxPlatform::AddPlatform(int platform) void wxPlatform::ClearPlatforms() { - delete sm_customPlatforms; - sm_customPlatforms = NULL; + wxDELETE(sm_customPlatforms); } /// Function for testing current platform @@ -943,7 +942,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags); #elif defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || \ - (defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)) + (defined(__WXOSX__) ) // implemented in a port-specific utils source file: bool wxDoLaunchDefaultBrowser(const wxString& url, int flags); @@ -1343,7 +1342,7 @@ void wxInfoMessageBox(wxWindow* parent) GTK_MICRO_VERSION); #endif // __WXGTK__ - msg += wxS("\nCopyright (c) 1995-2009 wxWidgets team"); + msg += wxS("\nCopyright (c) 1995-2010 wxWidgets team"); wxMessageBox(msg, wxT("wxWidgets information"), wxICON_INFORMATION | wxOK,