check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index 5b091fd03bab012262e84d755d971fe55c3af78e..e3c65df0812381d3185999e874f6c0e98d32f94f 100644 (file)
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -107,7 +107,9 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 #ifndef __WXMICROWIN__
 wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)
 {
 #ifndef __WXMICROWIN__
 wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)
 {

-    HRSRC hResource = ::FindResource(wxGetInstance(), resourceName, resourceType);
+    HRSRC hResource = ::FindResource(wxGetInstance(),
+                                     resourceName.wx_str(),
+                                     resourceType.wx_str());

     if ( hResource == 0 )
         return NULL;
 
     if ( hResource == 0 )
         return NULL;
 


@@ -126,8 +128,6 @@ wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourc
     wxStrncpy(s,theText,len);
     s[len]=0;
 
     wxStrncpy(s,theText,len);
     s[len]=0;
 

-    // wxChar *s = copystring(theText);
-

     // Obsolete in WIN32
 #ifndef __WIN32__
     UnlockResource(hData);
     // Obsolete in WIN32
 #ifndef __WIN32__
     UnlockResource(hData);


@@ -293,9 +293,9 @@ wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd)
     return str;
 }
 
     return str;
 }
 

-WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
+int WXDLLEXPORT wxGetWindowId(WXHWND hWnd)

 {
 {

-    return (WXWORD)GetWindowLong((HWND)hWnd, GWL_ID);
+    return ::GetWindowLong((HWND)hWnd, GWL_ID);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------