Ensure there is valid context for DrawRectangle

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 703a65ae20c95dd77a0da6bbf1c2a89318b9d08e..afd0bb2e6c0f38742c9bbf3cc2ac680ad7ea31c5 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -60,9 +60,7 @@
 #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 
 #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 

-    #ifndef __MWERKS__
-        #include <dos.h>
-    #endif
+    #include <dos.h>

 #endif  //GNUWIN32
 
 #if defined(__CYGWIN__)
 #endif  //GNUWIN32
 
 #if defined(__CYGWIN__)


@@ -143,7 +141,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
             !regKey.QueryValue(wxT("Name"), hostName) )
         return false;
 
             !regKey.QueryValue(wxT("Name"), hostName) )
         return false;
 

-    wxStrlcpy(buf, hostName.wx_str(), maxSize);
+    wxStrlcpy(buf, hostName.t_str(), maxSize);

 #else // !__WXWINCE__
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
 #else // !__WXWINCE__
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )


@@ -638,7 +636,8 @@ bool wxDoSetEnv(const wxString& var, const wxChar *value)
     envstr += '=';
     if ( value )
         envstr += value;
     envstr += '=';
     if ( value )
         envstr += value;

-    _tputenv(envstr.t_str());
+    if ( _tputenv(envstr.t_str()) != 0 )
+        return false;

 #else // other compiler
     if ( !::SetEnvironmentVariable(var.t_str(), value) )
     {
 #else // other compiler
     if ( !::SetEnvironmentVariable(var.t_str(), value) )
     {


@@ -1078,12 +1077,6 @@ unsigned long wxGetProcessId()
     return ::GetCurrentProcessId();
 }
 
     return ::GetCurrentProcessId();
 }
 

-// Emit a beeeeeep
-void wxBell()
-{
-    ::MessageBeep((UINT)-1);        // default sound
-}
-

 bool wxIsDebuggerRunning()
 {
 #if wxUSE_DYNLIB_CLASS
 bool wxIsDebuggerRunning()
 {
 #if wxUSE_DYNLIB_CLASS


@@ -1111,14 +1104,14 @@ bool
 wxLoadUserResource(const void **outData,
                    size_t *outLen,
                    const wxString& resourceName,
 wxLoadUserResource(const void **outData,
                    size_t *outLen,
                    const wxString& resourceName,

-                   const wxString& resourceType,
+                   const wxChar* resourceType,

                    WXHINSTANCE instance)
 {
     wxCHECK_MSG( outData && outLen, false, "output pointers can't be NULL" );
 
     HRSRC hResource = ::FindResource(instance,
                    WXHINSTANCE instance)
 {
     wxCHECK_MSG( outData && outLen, false, "output pointers can't be NULL" );
 
     HRSRC hResource = ::FindResource(instance,

-                                     resourceName.wx_str(),
-                                     resourceType.wx_str());
+                                     resourceName.t_str(),
+                                     resourceType);

     if ( !hResource )
         return false;
 
     if ( !hResource )
         return false;
 


@@ -1147,7 +1140,7 @@ wxLoadUserResource(const void **outData,
 
 char *
 wxLoadUserResource(const wxString& resourceName,
 
 char *
 wxLoadUserResource(const wxString& resourceName,

-                   const wxString& resourceType,
+                   const wxChar* resourceType,

                    int* pLen,
                    WXHINSTANCE instance)
 {
                    int* pLen,
                    WXHINSTANCE instance)
 {