Enable variadic macros for VC9 and later.

[wxWidgets.git] / src / msw / clipbrd.cpp
diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp

index b9df0c276755db21ee7645270ac8971eeda795d3..55c12d45af3ec798ff2dc5da135b5830ad6d6df9 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -90,13 +90,15 @@ bool wxOpenClipboard()
          gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0;
  
          if ( !gs_wxClipboardIsOpen )
+        {
              wxLogSysError(_("Failed to open the clipboard."));
+        }
  
          return gs_wxClipboardIsOpen;
      }
      else
      {
-        wxLogDebug(wxT("Can not open clipboard without a main window."));
+        wxLogDebug(wxT("Cannot open clipboard without a main window."));
  
          return false;
      }
@@ -212,7 +214,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
              {
                  wxBitmap *bitmap = (wxBitmap *)data;
  
-                if ( bitmap && bitmap->Ok() )
+                if ( bitmap && bitmap->IsOk() )
                  {
                      wxDIB dib(*bitmap);
                      if ( dib.IsOk() )
@@ -330,19 +332,19 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                  // string when you overwrite it so you follow up with code to replace
                  // the 0 appended at the end with a '\r'...
                  char *ptr = strstr(buf, "StartHTML");
-                sprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf);
+                sprintf(ptr+10, "%08u", (unsigned)(strstr(buf, "<html>") - buf));
                  *(ptr+10+8) = '\r';
  
                  ptr = strstr(buf, "EndHTML");
-                sprintf(ptr+8, "%08u", strlen(buf));
+                sprintf(ptr+8, "%08u", (unsigned)strlen(buf));
                  *(ptr+8+8) = '\r';
  
                  ptr = strstr(buf, "StartFragment");
-                sprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf);
+                sprintf(ptr+14, "%08u", (unsigned)(strstr(buf, "<!--StartFrag") - buf));
                  *(ptr+14+8) = '\r';
  
                  ptr = strstr(buf, "EndFragment");
-                sprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
+                sprintf(ptr+12, "%08u", (unsigned)(strstr(buf, "<!--EndFrag") - buf));
                  *(ptr+12+8) = '\r';
  
                  // Now you have everything in place ready to put on the