Fixed wxMessageBox with only an OK button returning wxCANCEL under MSW.

[wxWidgets.git] / src / os2 / dnd.cpp

diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index 0f61318b7756f2cf992054dcb396967f5c7e4b27..3afb3474f5b1f11d9fff0cae6eecc6274d345de5 100644 (file)
--- a/src/os2/dnd.cpp
+++ b/src/os2/dnd.cpp
@@ -19,10 +19,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"

+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
-

 #define INCL_PM
 #define INCL_DOS
 #include <os2.h>
 #define INCL_PM
 #define INCL_DOS
 #include <os2.h>


@@ -330,44 +329,44 @@ wxDataFormat wxDropTarget::GetSupportedFormat (
             case wxDF_TEXT:
             case wxDF_FILENAME:
             case wxDF_HTML:
             case wxDF_TEXT:
             case wxDF_FILENAME:
             case wxDF_HTML:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_TEXT");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_TEXT");

                 break;
 
             case wxDF_OEMTEXT:
                 break;
 
             case wxDF_OEMTEXT:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_OEMTEXT");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_OEMTEXT");

                 break;
 
             case wxDF_BITMAP:
                 break;
 
             case wxDF_BITMAP:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_BITMAP");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_BITMAP");

                 break;
 
             case wxDF_METAFILE:
             case wxDF_ENHMETAFILE:
                 break;
 
             case wxDF_METAFILE:
             case wxDF_ENHMETAFILE:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_METAFILE");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_METAFILE");

                 break;
 
             case wxDF_TIFF:
                 break;
 
             case wxDF_TIFF:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_TIFF");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_TIFF");

                 break;
 
             case wxDF_SYLK:
                 break;
 
             case wxDF_SYLK:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_SYLK");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_SYLK");

                 break;
 
             case wxDF_DIF:
                 break;
 
             case wxDF_DIF:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_DIF");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_DIF");

                 break;
 
             case wxDF_DIB:
                 break;
 
             case wxDF_DIB:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_DIB");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_DIB");

                 break;
 
             case wxDF_PALETTE:
                 break;
 
             case wxDF_PALETTE:


@@ -376,19 +375,19 @@ wxDataFormat wxDropTarget::GetSupportedFormat (
             case wxDF_WAVE:
             case wxDF_UNICODETEXT:
             case wxDF_LOCALE:
             case wxDF_WAVE:
             case wxDF_UNICODETEXT:
             case wxDF_LOCALE:

-                sMechanism = _T("DRM_OS2FILE");
-                sFormat    = _T("DRF_UNKNOWN");
+                sMechanism = wxT("DRM_OS2FILE");
+                sFormat    = wxT("DRF_UNKNOWN");

                 break;
 
             case wxDF_PRIVATE:
                 break;
 
             case wxDF_PRIVATE:

-                sMechanism = _T("DRM_OBJECT");
-                sFormat    = _T("DRF_UNKNOWN");
+                sMechanism = wxT("DRM_OBJECT");
+                sFormat    = wxT("DRF_UNKNOWN");

                 break;
         }
         for (i = 0; i < ulItems; i++)
         {
             pDragItem = ::DrgQueryDragitemPtr(pDataSource, i);
                 break;
         }
         for (i = 0; i < ulItems; i++)
         {
             pDragItem = ::DrgQueryDragitemPtr(pDataSource, i);

-            if (::DrgVerifyRMF(pDragItem, (PSZ)sMechanism.c_str(), (PSZ)sFormat.c_str()))
+            if (::DrgVerifyRMF(pDragItem, sMechanism.c_str(), sFormat.c_str()))

             {
                 bValid = true;
                 break;
             {
                 bValid = true;
                 break;


@@ -500,7 +499,7 @@ bool wxDropSource::GiveFeedback (
 {
     const wxCursor&                 rCursor = GetCursor(eEffect);
 
 {
     const wxCursor&                 rCursor = GetCursor(eEffect);
 

-    if (rCursor.Ok())
+    if (rCursor.IsOk())

     {
         ::WinSetPointer(HWND_DESKTOP, (HPOINTER)rCursor.GetHCURSOR());
         m_vDragImage.hImage = (LHANDLE)rCursor.GetHCURSOR();
     {
         ::WinSetPointer(HWND_DESKTOP, (HPOINTER)rCursor.GetHCURSOR());
         m_vDragImage.hImage = (LHANDLE)rCursor.GetHCURSOR();


@@ -561,7 +560,7 @@ void wxDropSource::Init ()
                                  ,(void*)pzBuffer
                                 );
 
                                  ,(void*)pzBuffer
                                 );
 

-    wxStrcpy(zFormats, _T("<DRM_OS2FILE, DRF_UNKNOWN>"));
+    wxStrcpy(zFormats, wxT("<DRM_OS2FILE, DRF_UNKNOWN>"));

     wxStrcpy(zContainer, GetDataObject()->GetPreferredFormat().GetId());
 
     hStrRMF       = ::DrgAddStrHandle((PSZ)zFormats);
     wxStrcpy(zContainer, GetDataObject()->GetPreferredFormat().GetId());
 
     hStrRMF       = ::DrgAddStrHandle((PSZ)zFormats);