1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

index 8955fe8840bc156db957a9696273c03c43dfc138..044ef30db20b73567dfa0263df8a8170e25aa648 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -17,10 +17,6 @@
  // headers
  // ---------------------------------------------------------------------------
  
  // headers
  // ---------------------------------------------------------------------------
  
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "clipbrd.h"
-#endif
-
  // For compilers that support precompilation, includes "wx.h".
  #include "wx/wxprec.h"
  
  // For compilers that support precompilation, includes "wx.h".
  #include "wx/wxprec.h"
  
@@ -298,8 +294,8 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                  handle = SetClipboardData(dataFormat, hGlobalMemory);
                  break;
              }
                  handle = SetClipboardData(dataFormat, hGlobalMemory);
                  break;
              }
-            // Only tested with non-Unicode, Visual C++ 6.0 so far
-#if defined(__VISUALC__) && !defined(UNICODE)
+            // Only tested with Visual C++ 6.0 so far
+#if defined(__VISUALC__)
          case wxDF_HTML:
              {
                  char* html = (char *)data;
          case wxDF_HTML:
              {
                  char* html = (char *)data;
@@ -336,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");
                  // 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");
-                wsprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf);
+                sprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf);
                  *(ptr+10+8) = '\r';
  
                  ptr = strstr(buf, "EndHTML");
                  *(ptr+10+8) = '\r';
  
                  ptr = strstr(buf, "EndHTML");
-                wsprintf(ptr+8, "%08u", strlen(buf));
+                sprintf(ptr+8, "%08u", strlen(buf));
                  *(ptr+8+8) = '\r';
  
                  ptr = strstr(buf, "StartFragment");
                  *(ptr+8+8) = '\r';
  
                  ptr = strstr(buf, "StartFragment");
-                wsprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf);
+                sprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf);
                  *(ptr+14+8) = '\r';
  
                  ptr = strstr(buf, "EndFragment");
                  *(ptr+14+8) = '\r';
  
                  ptr = strstr(buf, "EndFragment");
-                wsprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
+                sprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
                  *(ptr+12+8) = '\r';
  
                  // Now you have everything in place ready to put on the
                  *(ptr+12+8) = '\r';
  
                  // Now you have everything in place ready to put on the