makeg95.env edited for Mingw32/gcc 2.95 compilation; _T not redefined for

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 36aa9b6b05627c1210071d73c7acbfb7fc1d8601..b741d8fa1ae93c8e6735044b5cda57a3c55c604d 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -81,7 +81,7 @@ static bool gs_wxClipboardIsOpen = FALSE;
 
 bool wxOpenClipboard()
 {
 
 bool wxOpenClipboard()
 {

-    wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, "clipboard already opened." );
+    wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, wxT("clipboard already opened.") );

 
     wxWindow *win = wxTheApp->GetTopWindow();
     if ( win )
 
     wxWindow *win = wxTheApp->GetTopWindow();
     if ( win )


@@ -95,7 +95,7 @@ bool wxOpenClipboard()
     }
     else
     {
     }
     else
     {

-        wxLogDebug("Can not open clipboard without a main window,");
+        wxLogDebug(wxT("Can not open clipboard without a main window."));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -103,7 +103,7 @@ bool wxOpenClipboard()
 
 bool wxCloseClipboard()
 {
 
 bool wxCloseClipboard()
 {

-    wxCHECK_MSG( gs_wxClipboardIsOpen, FALSE, "clipboard is not opened" );
+    wxCHECK_MSG( gs_wxClipboardIsOpen, FALSE, wxT("clipboard is not opened") );

 
     gs_wxClipboardIsOpen = FALSE;
 
 
     gs_wxClipboardIsOpen = FALSE;
 


@@ -221,7 +221,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 wxBitmap *bitmap = (wxBitmap *)data;
                 HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
                 // NULL palette means to use the system one
                 wxBitmap *bitmap = (wxBitmap *)data;
                 HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
                 // NULL palette means to use the system one

-                HANDLE hDIB = BitmapToDIB(hBitmap, (HPALETTE)NULL); 
+                HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL); 

                 handle = SetClipboardData(CF_DIB, hDIB);
 #endif
                 break;
                 handle = SetClipboardData(CF_DIB, hDIB);
 #endif
                 break;


@@ -420,13 +420,13 @@ wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
   return ::EnumClipboardFormats(dataFormat);
 }
 
   return ::EnumClipboardFormats(dataFormat);
 }
 

-int wxRegisterClipboardFormat(char *formatName)
+int wxRegisterClipboardFormat(wxChar *formatName)

 {
   return ::RegisterClipboardFormat(formatName);
 }
 
 bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 {
   return ::RegisterClipboardFormat(formatName);
 }
 
 bool wxGetClipboardFormatName(wxDataFormat dataFormat,

-                              char *formatName,
+                              wxChar *formatName,

                               int maxCount)
 {
   return ::GetClipboardFormatName((int)dataFormat, formatName, maxCount) > 0;
                               int maxCount)
 {
   return ::GetClipboardFormatName((int)dataFormat, formatName, maxCount) > 0;


@@ -470,10 +470,10 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( data, FALSE, "data is invalid" );
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );

 
 #if wxUSE_DRAG_AND_DROP
 
 #if wxUSE_DRAG_AND_DROP

-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, "clipboard not open" );
+    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );

 
     wxDataFormat format = data->GetFormat();
 
 
     wxDataFormat format = data->GetFormat();
 


@@ -527,7 +527,7 @@ bool wxClipboard::IsSupported( wxDataFormat format )
 
 bool wxClipboard::GetData( wxDataObject *data )
 {
 
 bool wxClipboard::GetData( wxDataObject *data )
 {

-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, "clipboard not open" );
+    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );

 
 #if wxUSE_DRAG_AND_DROP
     wxDataFormat format = data->GetFormat();
 
 #if wxUSE_DRAG_AND_DROP
     wxDataFormat format = data->GetFormat();