added generic color dialog to setup

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

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index cb69904f95b2567f1e7d7fa3cc4d9e6b376a5e03..2f7651852aa227aeb73b69186208187d936fceca 100644 (file)
--- a/src/mac/clipbrd.cpp
+++ b/src/mac/clipbrd.cpp
@@ -80,7 +80,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
           }
           else
           {
           }
           else
           {

-            delete[] data ;
+            delete[] ((char *)data) ;

             data = NULL ;
           }
                        }
             data = NULL ;
           }
                        }


@@ -363,11 +363,6 @@ bool wxClipboard::GetData( wxDataObject& data )
     /* get formats from wxDataObjects */
     if ( !transferred ) 
     {
     /* get formats from wxDataObjects */
     if ( !transferred ) 
     {

-  #if !TARGET_CARBON
-       OSErr err = noErr ;
-  #else
-       OSStatus err = noErr ;
-  #endif

       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;