fix for 10.2 (persistent tooltips ;-)

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

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index 651f6f4722978fd6f08d993808a28ddf29ecf763..ff814a588c9357bb231dbc0eb3b26204b68db8d6 100644 (file)
--- a/src/mac/clipbrd.cpp
+++ b/src/mac/clipbrd.cpp
@@ -131,7 +131,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
  * Generalized clipboard implementation by Matthew Flatt
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase)
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
@@ -202,8 +202,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 
-    wxDataFormat format = data->GetPreferredFormat();
-
     /* we can only store one wxDataObject */
     Clear();
 
@@ -220,9 +218,9 @@ bool wxClipboard::AddData( wxDataObject *data )
                     array[i].GetId().c_str() );
 
 #if !TARGET_CARBON
-          OSErr err = noErr ;
+        OSErr err = noErr ;
 #else
-          OSStatus err = noErr ;
+        OSStatus err = noErr ;
 #endif
 
        switch ( array[i].GetType() )
@@ -252,7 +250,7 @@ bool wxClipboard::AddData( wxDataObject *data )
                         }
         #endif
            }
-           break;
+           break ;
 
 #if wxUSE_DRAG_AND_DROP
         case wxDF_METAFILE:
@@ -274,7 +272,7 @@ bool wxClipboard::AddData( wxDataObject *data )
       #endif
                     HUnlock(  (Handle) pict ) ;
            }
-           break;
+           break ;
 #endif
            case wxDF_BITMAP:
            case wxDF_DIB:
@@ -336,7 +334,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
-    int formatcount = data.GetFormatCount() + 1 ;
+    size_t formatcount = data.GetFormatCount() + 1 ;
     wxDataFormat *array = new wxDataFormat[ formatcount  ];
     array[0] = data.GetPreferredFormat();
     data.GetAllFormats( &array[1] );
@@ -389,6 +387,8 @@ bool wxClipboard::GetData( wxDataObject& data )
                     transferred = true ;
                   }
               }
+                                                       break ;
+
               default :
                 break ;
           }