don't allocate 0-sized buffer in cWC2MB() even if input size is 0

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 49f9715fe5b7fb76ae87e954a0bcffaedfb1b863..cf07a0a5c26eb02f61c2269a9586accc928743c3 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -72,7 +72,6 @@
     #include "wx/colordlg.h"
     #include "wx/fontdlg.h"
     #include "wx/notebook.h"
     #include "wx/colordlg.h"
     #include "wx/fontdlg.h"
     #include "wx/notebook.h"

-    #include "wx/frame.h"

     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 


@@ -454,7 +453,7 @@ bool wxPlatform::Is(int platform)
         return true;
 #endif
 #if defined(__WXWINCE__) && defined(__SMARTPHONE__)
         return true;
 #endif
 #if defined(__WXWINCE__) && defined(__SMARTPHONE__)

-    if (platform == wxWinSmartphone)
+    if (platform == wxWinSmartPhone)

         return true;
 #endif
 #ifdef __WXGTK__
         return true;
 #endif
 #ifdef __WXGTK__


@@ -819,7 +818,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
         {
             ConstStr255Param hint = 0;
             startSel = 0;
         {
             ConstStr255Param hint = 0;
             startSel = 0;

-            endSel = url.Length();
+            endSel = url.length();

             err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
             if (err != noErr)
                 wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);
             err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
             if (err != noErr)
                 wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);


@@ -1193,7 +1192,7 @@ wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wx
 
     wxColour colRet;
     wxColourDialog dialog(parent, &data);
 
     wxColour colRet;
     wxColourDialog dialog(parent, &data);

-    if (!caption.IsEmpty())
+    if (!caption.empty())

         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {
         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {


@@ -1218,7 +1217,7 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxStrin
 
     wxFont fontRet;
     wxFontDialog dialog(parent, data);
 
     wxFont fontRet;
     wxFontDialog dialog(parent, data);

-    if (!caption.IsEmpty())
+    if (!caption.empty())

         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {
         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {