Fixed three mouse event bugs

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index af48db1a5abb69605869b100a9fdf03285955398..f2cc312f8df4eb116f0e32e047e487512edf6523 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -10,7 +10,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation

 #pragma implementation "clipbrd.h"
 #endif
 
 #pragma implementation "clipbrd.h"
 #endif
 


@@ -25,7 +24,7 @@
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"
 #endif
 

-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD

 
 #ifndef WX_PRECOMP
 #include "wx/app.h"
 
 #ifndef WX_PRECOMP
 #include "wx/app.h"


@@ -86,13 +85,13 @@ bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
 {
   switch (dataFormat)
   {
 {
   switch (dataFormat)
   {

-    case wxCF_BITMAP:
+    case wxDF_BITMAP:

     {
       wxBitmap *wxBM = (wxBitmap *)obj;
 
       HDC hdcMem = CreateCompatibleDC(NULL);
       HDC hdcSrc = CreateCompatibleDC(NULL);
     {
       wxBitmap *wxBM = (wxBitmap *)obj;
 
       HDC hdcMem = CreateCompatibleDC(NULL);
       HDC hdcSrc = CreateCompatibleDC(NULL);

-      HBITMAP old = ::SelectObject(hdcSrc, (HBITMAP) wxBM->GetHBITMAP());
+      HBITMAP old = (HBITMAP) ::SelectObject(hdcSrc, (HBITMAP) wxBM->GetHBITMAP());

       HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
                                               wxBM->GetWidth(), wxBM->GetHeight());
       if (!hBitmap)
       HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
                                               wxBM->GetWidth(), wxBM->GetHeight());
       if (!hBitmap)


@@ -102,7 +101,7 @@ bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
         DeleteDC(hdcSrc);
         return FALSE;
       }
         DeleteDC(hdcSrc);
         return FALSE;
       }

-      HBITMAP old1 = SelectObject(hdcMem, hBitmap);
+      HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);

       BitBlt(hdcMem, 0, 0, wxBM->GetWidth(), wxBM->GetHeight(),
              hdcSrc, 0, 0, SRCCOPY);
 
       BitBlt(hdcMem, 0, 0, wxBM->GetWidth(), wxBM->GetHeight(),
              hdcSrc, 0, 0, SRCCOPY);
 


@@ -119,9 +118,9 @@ bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
       return success;
       break;
     }
       return success;
       break;
     }

-    case wxCF_DIB:
+    case wxDF_DIB:

     {
     {

-#if USE_IMAGE_LOADING_IN_MSW
+#if wxUSE_IMAGE_LOADING_IN_MSW

       HBITMAP hBitmap=(HBITMAP) ((wxBitmap *)obj)->GetHBITMAP();
       HANDLE hDIB=BitmapToDIB(hBitmap,NULL); // NULL==uses system palette
       bool success = (::SetClipboardData(CF_DIB,hDIB) != 0);
       HBITMAP hBitmap=(HBITMAP) ((wxBitmap *)obj)->GetHBITMAP();
       HANDLE hDIB=BitmapToDIB(hBitmap,NULL); // NULL==uses system palette
       bool success = (::SetClipboardData(CF_DIB,hDIB) != 0);


@@ -131,8 +130,8 @@ bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
       return success;
       break;
     }
       return success;
       break;
     }

-#if USE_METAFILE
-    case wxCF_METAFILE:
+#if wxUSE_METAFILE
+    case wxDF_METAFILE:

     {
       wxMetaFile *wxMF = (wxMetaFile *)obj;
       HANDLE data = GlobalAlloc(GHND, sizeof(METAFILEPICT) + 1);
     {
       wxMetaFile *wxMF = (wxMetaFile *)obj;
       HANDLE data = GlobalAlloc(GHND, sizeof(METAFILEPICT) + 1);


@@ -145,7 +144,7 @@ bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
       mf->mm = wxMF->GetWindowsMappingMode();
       mf->xExt = width;
       mf->yExt = height;
       mf->mm = wxMF->GetWindowsMappingMode();
       mf->xExt = width;
       mf->yExt = height;

-      mf->hMF = (HANDLE) wxMF->GetHMETAFILE();
+      mf->hMF = (HMETAFILE) wxMF->GetHMETAFILE();

       GlobalUnlock(data);
       wxMF->SetHMETAFILE((WXHANDLE) NULL);
 
       GlobalUnlock(data);
       wxMF->SetHMETAFILE((WXHANDLE) NULL);
 


@@ -161,9 +160,9 @@ bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
       return FALSE;
       break;
     }
       return FALSE;
       break;
     }

-    case wxCF_OEMTEXT:
-      dataFormat = wxCF_TEXT;
-    case wxCF_TEXT:
+    case wxDF_OEMTEXT:
+      dataFormat = wxDF_TEXT;
+    case wxDF_TEXT:

        width = strlen((char *)obj) + 1;
        height = 1;
     default:
        width = strlen((char *)obj) + 1;
        height = 1;
     default:


@@ -203,17 +202,17 @@ wxObject *wxGetClipboardData(int dataFormat, long *len)
 {
   switch (dataFormat)
   {
 {
   switch (dataFormat)
   {

-    case wxCF_BITMAP:
+    case wxDF_BITMAP:

     {
       BITMAP bm;
     {
       BITMAP bm;

-      HBITMAP hBitmap = GetClipboardData(CF_BITMAP);
+      HBITMAP hBitmap = (HBITMAP) GetClipboardData(CF_BITMAP);

       if (!hBitmap)
         return NULL;
 
       HDC hdcMem = CreateCompatibleDC(NULL);
       HDC hdcSrc = CreateCompatibleDC(NULL);
 
       if (!hBitmap)
         return NULL;
 
       HDC hdcMem = CreateCompatibleDC(NULL);
       HDC hdcSrc = CreateCompatibleDC(NULL);
 

-      HBITMAP old = ::SelectObject(hdcSrc, hBitmap);
+      HBITMAP old = (HBITMAP) ::SelectObject(hdcSrc, hBitmap);

       GetObject(hBitmap, sizeof(BITMAP), (LPSTR)&bm);
 
       HBITMAP hNewBitmap = CreateBitmapIndirect(&bm);
       GetObject(hBitmap, sizeof(BITMAP), (LPSTR)&bm);
 
       HBITMAP hNewBitmap = CreateBitmapIndirect(&bm);


@@ -226,7 +225,7 @@ wxObject *wxGetClipboardData(int dataFormat, long *len)
         return NULL;
       }
 
         return NULL;
       }
 

-      HBITMAP old1 = SelectObject(hdcMem, hNewBitmap);
+      HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hNewBitmap);

       BitBlt(hdcMem, 0, 0, bm.bmWidth, bm.bmHeight,
              hdcSrc, 0, 0, SRCCOPY);
 
       BitBlt(hdcMem, 0, 0, bm.bmWidth, bm.bmHeight,
              hdcSrc, 0, 0, SRCCOPY);
 


@@ -248,19 +247,19 @@ wxObject *wxGetClipboardData(int dataFormat, long *len)
       return (wxObject *)wxBM;
       break;
     }
       return (wxObject *)wxBM;
       break;
     }

-    case wxCF_METAFILE:
+    case wxDF_METAFILE:

     case CF_SYLK:
     case CF_DIF:
     case CF_TIFF:
     case CF_PALETTE:
     case CF_SYLK:
     case CF_DIF:
     case CF_TIFF:
     case CF_PALETTE:

-    case wxCF_DIB:
+    case wxDF_DIB:

     {
       return FALSE;
       break;
     }
     {
       return FALSE;
       break;
     }

-    case wxCF_OEMTEXT:
-      dataFormat = wxCF_TEXT;
-         case wxCF_TEXT:
+    case wxDF_OEMTEXT:
+      dataFormat = wxDF_TEXT;
+         case wxDF_TEXT:

     default:
     {
       HANDLE hGlobalMemory = GetClipboardData(dataFormat);
     default:
     {
       HANDLE hGlobalMemory = GetClipboardData(dataFormat);


@@ -342,8 +341,8 @@ wxClipboard::~wxClipboard()
 static int FormatStringToID(char *str)
 {
   if (!strcmp(str, "TEXT"))
 static int FormatStringToID(char *str)
 {
   if (!strcmp(str, "TEXT"))

-    return wxCF_TEXT;
-  
+    return wxDF_TEXT;
+

   return wxRegisterClipboardFormat(str);
 }
 
   return wxRegisterClipboardFormat(str);
 }
 


@@ -407,7 +406,7 @@ void wxClipboard::SetClipboardString(char *str, long time)
   cbString = str;
 
   if (wxOpenClipboard()) {
   cbString = str;
 
   if (wxOpenClipboard()) {

-    if (!wxSetClipboardData(wxCF_TEXT, (wxObject *)str))
+    if (!wxSetClipboardData(wxDF_TEXT, (wxObject *)str))

       got_selection = FALSE;
     else
                 got_selection = wxCloseClipboard();
       got_selection = FALSE;
     else
                 got_selection = wxCloseClipboard();


@@ -461,5 +460,5 @@ char *wxClipboard::GetClipboardData(char *format, long *length, long time)
 }
 
 
 }
 
 

-#endif // USE_CLIPBOARD
+#endif // wxUSE_CLIPBOARD