Empty string corrections.

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

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index fc902957b47abe5835beda473bd4ba65758acb67..3474d380ab6a59e49330cb04c5a9eaae43d85ee3 100644 (file)
--- a/src/os2/clipbrd.cpp
+++ b/src/os2/clipbrd.cpp
@@ -44,7 +44,7 @@
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dataobj.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dataobj.h"
 

-    static bool wxSetClipboardData(wxDataObject *data);
+//    static bool wxSetClipboardData(wxDataObject *data);

 #endif
 
 // ===========================================================================
 #endif
 
 // ===========================================================================


@@ -59,7 +59,7 @@ static bool gs_wxClipboardIsOpen = FALSE;
 
 bool wxOpenClipboard()
 {
 
 bool wxOpenClipboard()
 {

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

 // TODO:
 /*
     wxWindow *win = wxTheApp->GetTopWindow();
 // TODO:
 /*
     wxWindow *win = wxTheApp->GetTopWindow();


@@ -96,7 +96,7 @@ bool wxCloseClipboard()
         return FALSE;
     }
 */
         return FALSE;
     }
 */

-    return TRUE;
+    return true;

 }
 
 bool wxEmptyClipboard()
 }
 
 bool wxEmptyClipboard()


@@ -110,7 +110,7 @@ bool wxEmptyClipboard()
         return FALSE;
     }
 */
         return FALSE;
     }
 */

-    return TRUE;
+    return true;

 }
 
 bool wxIsClipboardOpened()
 }
 
 bool wxIsClipboardOpened()


@@ -118,12 +118,13 @@ bool wxIsClipboardOpened()
   return gs_wxClipboardIsOpen;
 }
 
   return gs_wxClipboardIsOpen;
 }
 

-bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
+bool wxIsClipboardFormatAvailable(wxDataFormat WXUNUSED(dataFormat))

 {
     // TODO: return ::IsClipboardFormatAvailable(dataFormat) != 0;
 {
     // TODO: return ::IsClipboardFormatAvailable(dataFormat) != 0;

-    return FALSE;
+    return false;

 }
 
 }
 

+#if 0

 #if wxUSE_DRAG_AND_DROP
 static bool wxSetClipboardData(wxDataObject *data)
 {
 #if wxUSE_DRAG_AND_DROP
 static bool wxSetClipboardData(wxDataObject *data)
 {


@@ -154,9 +155,10 @@ static bool wxSetClipboardData(wxDataObject *data)
         return FALSE;
     }
 */
         return FALSE;
     }
 */

-    return TRUE;
+    return true;

 }
 #endif // wxUSE_DRAG_AND_DROP
 }
 #endif // wxUSE_DRAG_AND_DROP

+#endif

 
 bool wxSetClipboardData(wxDataFormat dataFormat,
                         const void *data,
 
 bool wxSetClipboardData(wxDataFormat dataFormat,
                         const void *data,


@@ -276,12 +278,12 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
         return FALSE;
     }
 */
         return FALSE;
     }
 */

-    return TRUE;
+    return true;

 }
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
 }
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {

-    void *retval = NULL;
+//  void *retval = NULL;

 // TODO:
 /*
     switch ( dataFormat )
 // TODO:
 /*
     switch ( dataFormat )


@@ -327,7 +329,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
                 wxBM->SetWidth(bm.bmWidth);
                 wxBM->SetHeight(bm.bmHeight);
                 wxBM->SetDepth(bm.bmPlanes);
                 wxBM->SetWidth(bm.bmWidth);
                 wxBM->SetHeight(bm.bmHeight);
                 wxBM->SetDepth(bm.bmPlanes);

-                wxBM->SetOk(TRUE);
+                wxBM->SetOk(true);

                 retval = wxBM;
                 break;
             }
                 retval = wxBM;
                 break;
             }


@@ -469,9 +471,9 @@ bool wxClipboard::SetData( wxDataObject *data )
     if ( data )
         return AddData(data);
     else
     if ( data )
         return AddData(data);
     else

-        return TRUE;
+        return true;

     */
     */

-    return TRUE;
+    return true;

 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 }
 
 bool wxClipboard::AddData( wxDataObject *data )


@@ -481,7 +483,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 #if wxUSE_DRAG_AND_DROP
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #if wxUSE_DRAG_AND_DROP
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 

-//    wxDataFormat format = data->GetFormat();
+//    wxDataFormat format = data->GetPreferredFormat();

 // TODO:
 /*
     switch ( format )
 // TODO:
 /*
     switch ( format )


@@ -499,7 +501,7 @@ bool wxClipboard::AddData( wxDataObject *data )
         {
             wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
             wxBitmap bitmap(bitmapDataObject->GetBitmap());
         {
             wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
             wxBitmap bitmap(bitmapDataObject->GetBitmap());

-            return wxSetClipboardData(data->GetFormat(), &bitmap);
+            return wxSetClipboardData(data->GetPreferredFormat(), &bitmap);

         }
 
 #if wxUSE_METAFILE
         }
 
 #if wxUSE_METAFILE


@@ -520,6 +522,8 @@ bool wxClipboard::AddData( wxDataObject *data )
 #else // !wxUSE_DRAG_AND_DROP
 */
     return FALSE;
 #else // !wxUSE_DRAG_AND_DROP
 */
     return FALSE;

+#else
+    return FALSE;

 #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
 }
 
 #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
 }
 


@@ -528,17 +532,17 @@ void wxClipboard::Close()
     wxCloseClipboard();
 }
 
     wxCloseClipboard();
 }
 

-bool wxClipboard::IsSupported( wxDataFormat format )
+bool wxClipboard::IsSupported( const wxDataFormat& format )

 {
     return wxIsClipboardFormatAvailable(format);
 }
 
 {
     return wxIsClipboardFormatAvailable(format);
 }
 

-bool wxClipboard::GetData( wxDataObject *data )
+bool wxClipboard::GetData( wxDataObject& data )

 {
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #if wxUSE_DRAG_AND_DROP
 {
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #if wxUSE_DRAG_AND_DROP

-//    wxDataFormat format = data->GetFormat();
+//    wxDataFormat format = data.GetPreferredFormat();

     // TODO:
 /*
     switch ( format )
     // TODO:
 /*
     switch ( format )


@@ -546,13 +550,13 @@ bool wxClipboard::GetData( wxDataObject *data )
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {

-            wxTextDataObject* textDataObject = (wxTextDataObject*) data;
+            wxTextDataObject& textDataObject = (wxTextDataObject&) data;

             char* s = (char*) wxGetClipboardData(format);
             if ( s )
             {
             char* s = (char*) wxGetClipboardData(format);
             if ( s )
             {

-                textDataObject->SetText(s);
+                textDataObject.SetText(s);

                 delete[] s;
                 delete[] s;

-                return TRUE;
+                return true;

             }
             else
                 return FALSE;
             }
             else
                 return FALSE;


@@ -561,13 +565,13 @@ bool wxClipboard::GetData( wxDataObject *data )
         case wxDF_BITMAP:
         case wxDF_DIB:
         {
         case wxDF_BITMAP:
         case wxDF_DIB:
         {

-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject *)data;
-            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat());
+            wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
+            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetPreferredFormat());

             if (bitmap)
             {
             if (bitmap)
             {

-                bitmapDataObject->SetBitmap(* bitmap);
+                bitmapDataObject.SetBitmap(* bitmap);

                 delete bitmap;
                 delete bitmap;

-                return TRUE;
+                return true;

             }
             else
                 return FALSE;
             }
             else
                 return FALSE;


@@ -575,13 +579,13 @@ bool wxClipboard::GetData( wxDataObject *data )
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {

-            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject *)data;
+            wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;

             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if (metaFile)
             {
             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if (metaFile)
             {

-                metaFileDataObject->SetMetafile(*metaFile);
+                metaFileDataObject.SetMetafile(*metaFile);

                 delete metaFile;
                 delete metaFile;

-                return TRUE;
+                return true;

             }
             else
                 return FALSE;
             }
             else
                 return FALSE;


@@ -594,10 +598,10 @@ bool wxClipboard::GetData( wxDataObject *data )
                 if ( buf )
                 {
                     // FIXME this is for testing only!!
                 if ( buf )
                 {
                     // FIXME this is for testing only!!

-                    ((wxPrivateDataObject *)data)->SetData(buf, len);
+                    ((wxPrivateDataObject &)data).SetData(buf, len);

                     free(buf);
 
                     free(buf);
 

-                    return TRUE;
+                    return true;

                 }
             }
 
                 }
             }
 


@@ -606,10 +610,9 @@ bool wxClipboard::GetData( wxDataObject *data )
 #else
 */
     return FALSE;
 #else
 */
     return FALSE;

+#else
+    return FALSE;

 #endif
 }
 
 #endif
 }
 

-#else
-    #error "Please turn wxUSE_CLIPBOARD on to compile this file."

 #endif // wxUSE_CLIPBOARD
 #endif // wxUSE_CLIPBOARD

-