*** empty log message ***

[wxWidgets.git] / src / msw / utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 53db01e6d8c48cb4fc503188580928be338fb5e0..7126032d69a10c291b13fb363330de093883d310 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mse/utils.cpp
+// Name:        msw/utils.cpp
 // Purpose:     Various utilities
 // Author:      Julian Smart
 // Modified by:
@@ -454,7 +454,7 @@ bool wxShell(const wxString& command)
         cmd.Printf(wxT("%s /c %s"), shell, command.c_str());
     }
 
-    return wxExecute(cmd, FALSE) != 0;
+    return wxExecute(cmd, TRUE /* sync */) != 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -806,10 +806,15 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
 // helper functions for showing a "busy" cursor
 // ---------------------------------------------------------------------------
 
-HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
-HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
+static HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
+static HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
 static int gs_wxBusyCursorCount = 0;
 
+extern HCURSOR wxGetCurrentBusyCursor()
+{
+    return gs_wxBusyCursor;
+}
+
 // Set the cursor to the busy cursor for all windows
 void wxBeginBusyCursor(wxCursor *cursor)
 {
@@ -876,7 +881,14 @@ wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourc
     if ( !theText )
         return NULL;
 
-    wxChar *s = copystring(theText);
+    // Not all compilers put a zero at the end of the resource (e.g. BC++ doesn't).
+    // so we need to find the length of the resource.
+    int len = ::SizeofResource(wxGetInstance(), hResource);
+    wxChar  *s = new wxChar[len+1];
+    wxStrncpy(s,theText,len);
+    s[len]=0;
+
+    // wxChar *s = copystring(theText);
 
     // Obsolete in WIN32
 #ifndef __WIN32__