implemented generic clipboard, corrected event handling for radiobutton

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/clipbrd.cpp

@@ -26,228 +26,10 @@
 
 #include <string.h>
 
-// open/close
+// the trace mask we use with wxLogTrace() - call
-
+// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
-bool clipboard_opened = false ;
+// (there will be a *lot* of them!)
-
+static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
-bool wxOpenClipboard()
-{
-	clipboard_opened = true ;
-    return TRUE;
-}
-
-bool wxCloseClipboard()
-{
-	clipboard_opened = false ;
-    return TRUE;
-}
-
-bool wxIsClipboardOpened()
-{
-     return clipboard_opened;
-}
-
-bool wxEmptyClipboard()
-{
-	
-#if TARGET_CARBON
-	OSStatus err ;
-	err = ClearCurrentScrap( );
-#else
-	OSErr err ;
-	err = ZeroScrap( );
-#endif
-	if ( err )
-	{
-        wxLogSysError(_("Failed to empty the clipboard."));
-		return FALSE ;
-	}
-    return TRUE;
-}
-
-// get/set data
-
-// clipboard formats
-
-bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
-{
-#if TARGET_CARBON
-	OSStatus err = noErr;
-	ScrapRef scrapRef;
-	
-	err = GetCurrentScrap( &scrapRef );
-	if ( err != noTypeErr && err != memFullErr )	
-	{
-		ScrapFlavorFlags	flavorFlags;
-		Size				byteCount;
-		
-		if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
-		{
-			if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
-			{
-				return TRUE ;
-			}
-		}
-	}
-	return FALSE;
-	
-#else
-	long offset ;
-	Handle datahandle = NewHandle(0) ;
-	HLock( datahandle ) ;
-	GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
-	HUnlock( datahandle ) ;
-	bool hasData = GetHandleSize( datahandle ) > 0 ;
-	DisposeHandle( datahandle ) ;
-	return hasData ;
-#endif
-}
-
-bool wxSetClipboardData(wxDataFormat dataFormat,const void *data,int width , int height)
-{
-#if !TARGET_CARBON
-	OSErr err = noErr ;
-#else
-	OSStatus err = noErr ;
-#endif
-	
-    switch (dataFormat.GetType())
-    {
-        case wxDF_BITMAP:
-            {
-            	/*
-                wxBitmap *bitmap = (wxBitmap *)data;
-
-                HDC hdcMem = CreateCompatibleDC((HDC) NULL);
-                HDC hdcSrc = CreateCompatibleDC((HDC) NULL);
-                HBITMAP old = (HBITMAP)
-                    ::SelectObject(hdcSrc, (HBITMAP)bitmap->GetHBITMAP());
-                HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
-                                                         bitmap->GetWidth(),
-                                                         bitmap->GetHeight());
-                if (!hBitmap)
-                {
-                    SelectObject(hdcSrc, old);
-                    DeleteDC(hdcMem);
-                    DeleteDC(hdcSrc);
-                    return FALSE;
-                }
-
-                HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
-                BitBlt(hdcMem, 0, 0, bitmap->GetWidth(), bitmap->GetHeight(),
-                       hdcSrc, 0, 0, SRCCOPY);
-
-                // Select new bitmap out of memory DC
-                SelectObject(hdcMem, old1);
-
-                // Set the data
-                handle = ::SetClipboardData(CF_BITMAP, hBitmap);
-
-                // Clean up
-                SelectObject(hdcSrc, old);
-                DeleteDC(hdcSrc);
-                DeleteDC(hdcMem);
-                */
-                break;
-            }
-
-        case wxDF_DIB:
-            {
-            	/*
-#if wxUSE_IMAGE_LOADING_IN_MSW
-                wxBitmap *bitmap = (wxBitmap *)data;
-                HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
-                // NULL palette means to use the system one
-                HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL); 
-                handle = SetClipboardData(CF_DIB, hDIB);
-#endif // wxUSE_IMAGE_LOADING_IN_MSW
-*/
-                break;
-            }
-
-#if wxUSE_METAFILE
-        case wxDF_METAFILE:
-            {
-                wxMetafile *wxMF = (wxMetafile *)data;
-				PicHandle pict = wxMF->GetHMETAFILE() ;
-				HLock( (Handle) pict ) ;
-#if !TARGET_CARBON
-				err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
-#else
-				ScrapRef	scrap;
-				err = GetCurrentScrap (&scrap); 
-				if ( !err )
-				{
-					err = PutScrapFlavor (scrap, 'PICT', 0, GetHandleSize((Handle) pict), *pict);
-				}
-#endif
-				HUnlock(  (Handle) pict ) ;
-                break;
-            }
-#endif
-        case wxDF_SYLK:
-        case wxDF_DIF:
-        case wxDF_TIFF:
-        case wxDF_PALETTE:
-        default:
-            {
-                wxLogError(_("Unsupported clipboard format."));
-                return FALSE;
-            }
-
-        case wxDF_OEMTEXT:
-            dataFormat = wxDF_TEXT;
-            // fall through
-
-        case wxDF_TEXT:
-            {
-            	wxString mac ;
-            	if ( wxApp::s_macDefaultEncodingIsPC )
-            	{
-            		mac = wxMacMakeMacStringFromPC((char *)data) ;
-            	}
-            	else
-            	{
-            		mac = (char *)data ;
-            	}
-#if !TARGET_CARBON
-				err = PutScrap( mac.Length() , 'TEXT' , mac.c_str() ) ;
-#else
-				ScrapRef	scrap;
-				err = GetCurrentScrap (&scrap); 
-				if ( !err )
-				{
-					err = PutScrapFlavor (scrap, 'TEXT', 0, mac.Length(), mac.c_str());
-				}
-#endif
-                break;
-            }
-    }
-
-    if ( err )
-    {
-        wxLogSysError(_("Failed to set clipboard data."));
-
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
-{
-    return wxDataFormat();
-}
-
-int  wxRegisterClipboardFormat(wxChar *formatName)
-{
-    return 0;
-}
-
-bool wxGetClipboardFormatName(wxDataFormat dataFormat, wxChar *formatName, int maxCount)
-{
-    return FALSE;
-}
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
@@ -260,27 +42,17 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 	
     switch (dataFormat.GetType())
     {
-        case wxDF_BITMAP:
-        case wxDF_DIB:
-#if wxUSE_METAFILE
-        case wxDF_METAFILE:
-#endif
-        case wxDF_SYLK:
-        case wxDF_DIF:
-        case wxDF_TIFF:
-        case wxDF_PALETTE:
-        default:
-            {
-                wxLogError(_("Unsupported clipboard format."));
-                return NULL;
-            }
-
         case wxDF_OEMTEXT:
             dataFormat = wxDF_TEXT;
             // fall through
 
         case wxDF_TEXT:
                 break;
+        default:
+            {
+                wxLogError(_("Unsupported clipboard format."));
+                return NULL;
+            }
     }
 
 #if TARGET_CARBON
@@ -358,19 +130,37 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase)
 
 wxClipboard::wxClipboard()
 {
-    m_clearOnExit = FALSE;
+  m_open = false ;
+  m_data = NULL ;
 }
 
 wxClipboard::~wxClipboard()
 {
-    if ( m_clearOnExit )
+    if (m_data)
     {
-        Clear();
+        delete m_data;
+        m_data = (wxDataObject*) NULL;
     }
 }
 
 void wxClipboard::Clear()
 {
+    if (m_data)
+    {
+        delete m_data;
+        m_data = (wxDataObject*) NULL;
+    }
+#if TARGET_CARBON
+	OSStatus err ;
+	err = ClearCurrentScrap( );
+#else
+	OSErr err ;
+	err = ZeroScrap( );
+#endif
+	if ( err )
+	{
+        wxLogSysError(_("Failed to empty the clipboard."));
+	}
 }
 
 bool wxClipboard::Flush()
@@ -380,257 +170,229 @@ bool wxClipboard::Flush()
 
 bool wxClipboard::Open()
 {
-    return wxOpenClipboard();
+    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
+    m_open = true ;
+    return true ;
 }
 
 bool wxClipboard::IsOpened() const
 {
-    return wxIsClipboardOpened();
+    return m_open;
-}
-
-static int FormatStringToID(char *str)
-{
-  if (!strcmp(str, "TEXT"))
-    return wxDF_TEXT;
-
-  return wxRegisterClipboardFormat(str);
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
-    (void)wxEmptyClipboard();
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+
+    Clear();
 
-    if ( data )
     return AddData( data );
-    else
-        return TRUE;
 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
-#if wxUSE_DATAOBJ
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
     wxDataFormat format = data->GetPreferredFormat();
 
-    switch ( format.GetType() )
+    /* we can only store one wxDataObject */
+    Clear();
+
+    m_data = data;
+
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+    {
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard now supports atom %s"),
+                    array[i].GetId().c_str() );
+
+#if !TARGET_CARBON
+	      OSErr err = noErr ;
+#else
+	      OSStatus err = noErr ;
+#endif
+
+       switch ( array[i].GetType() )
        {
            case wxDF_TEXT:
            case wxDF_OEMTEXT:
            {
                wxTextDataObject* textDataObject = (wxTextDataObject*) data;
                wxString str(textDataObject->GetText());
-            return wxSetClipboardData(format, str.c_str());
+              	wxString mac ;
-        }
+              	if ( wxApp::s_macDefaultEncodingIsPC )
-
-        case wxDF_BITMAP:
-        case wxDF_DIB:
               	{
-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
+              		mac = wxMacMakeMacStringFromPC(textDataObject->GetText()) ;
-            wxBitmap bitmap(bitmapDataObject->GetBitmap());
+              	}
-            return wxSetClipboardData(format, &bitmap);
+              	else
+              	{
+              		mac = textDataObject->GetText() ;
+              	}
+        #if !TARGET_CARBON
+        				err = PutScrap( mac.Length() , 'TEXT' , mac.c_str() ) ;
+        #else
+        				ScrapRef	scrap;
+        				err = GetCurrentScrap (&scrap); 
+        				if ( !err )
+        				{
+        					err = PutScrapFlavor (scrap, 'TEXT', 0, mac.Length(), mac.c_str());
+        				}
+        #endif
            }
 
-#if 0 // wxUSE_METAFILE
+#if wxUSE_DRAG_AND_DROP
         case wxDF_METAFILE:
            {
               wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;
               wxMetafile metaFile = metaFileDataObject->GetMetafile();
-            return wxSetClipboardData(wxDF_METAFILE, &metaFile,
+      				PicHandle pict = metaFile->GetHMETAFILE() ;
-                                      metaFileDataObject->GetWidth(),
+      				HLock( (Handle) pict ) ;
-                                      metaFileDataObject->GetHeight());
+      #if !TARGET_CARBON
+      				err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
+      #else
+      				ScrapRef	scrap;
+      				err = GetCurrentScrap (&scrap); 
+      				if ( !err )
+      				{
+      					err = PutScrapFlavor (scrap, 'PICT', 0, GetHandleSize((Handle) pict), *pict);
       				}
-#endif // wxUSE_METAFILE
+      #endif
-
+      				HUnlock(  (Handle) pict ) ;
+           }
+#endif
+           case wxDF_BITMAP:
+           case wxDF_DIB:
            default:
- //           return wxSetClipboardData(data);
       			break ;
        }
-#else // !wxUSE_DATAOBJ
+
-#endif 
+    }
-    return FALSE;
+
+    delete[] array;
+
+    return true ;
 }
 
 void wxClipboard::Close()
 {
-    wxCloseClipboard();
+    m_open = false ;
 }
 
-bool wxClipboard::IsSupported( const wxDataFormat &format )
+bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 {
-    return wxIsClipboardFormatAvailable(format);
+  if ( m_data )
+  {
+    return m_data->IsSupported( dataFormat ) ;
+  }
+#if TARGET_CARBON
+	OSStatus err = noErr;
+	ScrapRef scrapRef;
+	
+	err = GetCurrentScrap( &scrapRef );
+	if ( err != noTypeErr && err != memFullErr )	
+	{
+		ScrapFlavorFlags	flavorFlags;
+		Size				byteCount;
+		
+		if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
+		{
+			if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
+			{
+				return TRUE ;
+			}
+		}
+	}
+	return FALSE;
+	
+#else
+	long offset ;
+	Handle datahandle = NewHandle(0) ;
+	HLock( datahandle ) ;
+	GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
+	HUnlock( datahandle ) ;
+	bool hasData = GetHandleSize( datahandle ) > 0 ;
+	DisposeHandle( datahandle ) ;
+	return hasData ;
+#endif
 }
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
-#if wxUSE_DATAOBJ
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+
+    int formatcount = data.GetFormatCount() + 1 ;
+    wxDataFormat *array = new wxDataFormat[ formatcount  ];
+    array[0] = data.GetPreferredFormat();
+    data.GetAllFormats( &array[1] );
+
+    bool transferred = false ;
+
+    if ( m_data )
+    {
+      for (size_t i = 0; !transferred && i < formatcount ; i++)
+      {
+          wxDataFormat format = array[i] ;
+          if ( m_data->IsSupported( format ) ) 
+          {
+            int size = m_data->GetDataSize( format );
+            transferred = true ;
+
+            if (size == 0) 
+            {
+              data.SetData(format , 0 , 0 ) ;
+            }
+            else
+            {
+              char *d = new char[size];
+              m_data->GetDataHere( format , (void*) d );
+              data.SetData( format , size , d ) ;
+              delete[] d ;
+            }
+          }
+       }
+    }
+    /* 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] ;
 
-    wxDataFormat format = data.GetPreferredFormat();
           switch ( format.GetType() )
           {
               case wxDF_TEXT:
               case wxDF_OEMTEXT:
               {
-            wxTextDataObject& textDataObject = (wxTextDataObject &)data;
+                  long len ;
-            char* s = (char*)wxGetClipboardData(format);
+                  char* s = (char*)wxGetClipboardData(format, &len );
-            if ( !s )
+                  if ( s )
-                return FALSE;
+                  {
-
+                    data.SetData( format , len , s ) ;
-            textDataObject.SetText(s);
                     delete [] s;
 
-            return TRUE;
+                    transferred = true ;
                   }
-
-        case wxDF_BITMAP:
-        case wxDF_DIB:
-        {
-            wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
-            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(format );
-            if ( !bitmap )
-                return FALSE;
-
-            bitmapDataObject.SetBitmap(*bitmap);
-            delete bitmap;
-
-            return TRUE;
               }
-#if 0 // wxUSE_METAFILE
+              default :
-        case wxDF_METAFILE:
-        {
-            wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
-            wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
-            if ( !metaFile )
-                return FALSE;
-
-            metaFileDataObject.SetMetafile(*metaFile);
-            delete metaFile;
-
-            return TRUE;
-        }
-#endif // wxUSE_METAFILE
-    }
-#else // !wxUSE_DATAOBJ
-    wxFAIL_MSG( wxT("no clipboard implementation") );
-#endif
-    return FALSE;
-}
-/*
-void wxClipboard::SetClipboardClient(wxClipboardClient *client, long time)
-{
-  bool got_selection;
-
-  if (clipOwner)
-    clipOwner->BeingReplaced();
-  clipOwner = client;
-  if (cbString) {
-    delete[] cbString;
-    cbString = NULL;
-  }
-
-  if (wxOpenClipboard()) {
-    char **formats, *data;
-         int i;
-    int ftype;
-    long size;
-
-    formats = clipOwner->formats.ListToArray(FALSE);
-    for (i = clipOwner->formats.Number(); i--; ) {
-      ftype = FormatStringToID(formats[i]);
-      data = clipOwner->GetData(formats[i], &size);
-      if (!wxSetClipboardData(ftype, (wxObject *)data, size, 1)) {
-        got_selection = FALSE;
                 break ;
           }
        }
-
-    if (i < 0)
-      got_selection = wxCloseClipboard();
-  } else
-    got_selection = FALSE;
-  
-  got_selection = FALSE; // Assume another process takes over
-
-  if (!got_selection) {
-    clipOwner->BeingReplaced();
-         clipOwner = NULL;
-  }
     }
 
-wxClipboardClient *wxClipboard::GetClipboardClient()
+    delete[] array ;
-{
+    return transferred ;
-  return clipOwner;
 }
-
-void wxClipboard::SetClipboardString(char *str, long time)
-{
-  bool got_selection;
-
-  if (clipOwner) {
-    clipOwner->BeingReplaced();
-    clipOwner = NULL;
-  }
-  if (cbString)
-    delete[] cbString;
-
-  cbString = str;
-
-  if (wxOpenClipboard()) {
-    if (!wxSetClipboardData(wxDF_TEXT, (wxObject *)str))
-      got_selection = FALSE;
-    else
-                got_selection = wxCloseClipboard();
-  } else
-    got_selection = FALSE;
-
-  got_selection = FALSE; // Assume another process takes over
-
-  if (!got_selection) {
-    delete[] cbString;
-    cbString = NULL;
-  }
-}
-char *wxClipboard::GetClipboardString(long time)
-{
-  char *str;
-  long length;
-
-  str = GetClipboardData("TEXT", &length, time);
-  if (!str) {
-    str = new char[1];
-    *str = 0;
-  }
-
-  return str;
-}
-
-
-char *wxClipboard::GetClipboardData(char *format, long *length, long time)
-{
-  if (clipOwner)  {
-         if (clipOwner->formats.Member(format))
-      return clipOwner->GetData(format, length);
-    else
-      return NULL;
-  } else if (cbString) {
-    if (!strcmp(format, "TEXT"))
-      return copystring(cbString);
-    else
-      return NULL;
-  } else {
-    if (wxOpenClipboard()) {
-      receivedString = (char *)wxGetClipboardData(FormatStringToID(format), 
-                                                  length);
-      wxCloseClipboard();
-    } else
-      receivedString = NULL;
-
-    return receivedString;
-  }
-}
-*/
-

src/mac/carbon/metafile.cpp

@@ -83,19 +83,21 @@ wxMetaFile::~wxMetaFile()
 
 bool wxMetaFile::SetClipboard(int width, int height)
 {
+#if wxUSE_DRAG_AND_DROP
+//TODO finishi this port , we need the data obj first
     if (!m_refData)
         return FALSE;
 
-    bool alreadyOpen=wxClipboardOpen();
+    bool alreadyOpen=wxTheClipboard->IsOpened() ;
     if (!alreadyOpen)
     {
-        wxOpenClipboard();
+        wxTheClipboard->Open();
-        if (!wxEmptyClipboard()) return FALSE;
+        if (!wxTheClipboard->Clear()) return FALSE;
     }
     bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
     if (!alreadyOpen) wxCloseClipboard();
 	    return (bool) success;
-
+#endif
     return TRUE ;
 }
 

src/mac/carbon/radiobut.cpp

@@ -81,10 +81,6 @@ void wxRadioButton::SetValue(bool val)
    				}
    			}
    		}
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
-    event.SetEventObject(this);
-    event.SetInt( GetValue() );
-    ProcessCommand(event);
 }
 
 bool wxRadioButton::GetValue() const
@@ -100,7 +96,33 @@ void wxRadioButton::Command (wxCommandEvent & event)
 
 void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
+    if ( GetValue() )
+      return ;
+      
+	  wxRadioButton *cycle, *old = NULL ;
+    cycle=this->NextInCycle();
+    if (cycle!=NULL) {
+    	  while (cycle!=this) {
+    	    if ( cycle->GetValue() ) {
+    	      old = cycle ;
+    		    cycle->SetValue(false);
+    		  }
+    		  cycle=cycle->NextInCycle();
+    		}
+    }
+
 	  SetValue(true) ;
+
+    if ( old ) {
+      wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId );
+      event.SetEventObject(old);
+      event.SetInt( false );
+      old->ProcessCommand(event);
+    }
+    wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    event2.SetEventObject(this);
+    event2.SetInt( true );
+    ProcessCommand(event2);
 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)

src/mac/clipbrd.cpp

@@ -26,228 +26,10 @@
 
 #include <string.h>
 
-// open/close
+// the trace mask we use with wxLogTrace() - call
-
+// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
-bool clipboard_opened = false ;
+// (there will be a *lot* of them!)
-
+static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
-bool wxOpenClipboard()
-{
-	clipboard_opened = true ;
-    return TRUE;
-}
-
-bool wxCloseClipboard()
-{
-	clipboard_opened = false ;
-    return TRUE;
-}
-
-bool wxIsClipboardOpened()
-{
-     return clipboard_opened;
-}
-
-bool wxEmptyClipboard()
-{
-	
-#if TARGET_CARBON
-	OSStatus err ;
-	err = ClearCurrentScrap( );
-#else
-	OSErr err ;
-	err = ZeroScrap( );
-#endif
-	if ( err )
-	{
-        wxLogSysError(_("Failed to empty the clipboard."));
-		return FALSE ;
-	}
-    return TRUE;
-}
-
-// get/set data
-
-// clipboard formats
-
-bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
-{
-#if TARGET_CARBON
-	OSStatus err = noErr;
-	ScrapRef scrapRef;
-	
-	err = GetCurrentScrap( &scrapRef );
-	if ( err != noTypeErr && err != memFullErr )	
-	{
-		ScrapFlavorFlags	flavorFlags;
-		Size				byteCount;
-		
-		if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
-		{
-			if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
-			{
-				return TRUE ;
-			}
-		}
-	}
-	return FALSE;
-	
-#else
-	long offset ;
-	Handle datahandle = NewHandle(0) ;
-	HLock( datahandle ) ;
-	GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
-	HUnlock( datahandle ) ;
-	bool hasData = GetHandleSize( datahandle ) > 0 ;
-	DisposeHandle( datahandle ) ;
-	return hasData ;
-#endif
-}
-
-bool wxSetClipboardData(wxDataFormat dataFormat,const void *data,int width , int height)
-{
-#if !TARGET_CARBON
-	OSErr err = noErr ;
-#else
-	OSStatus err = noErr ;
-#endif
-	
-    switch (dataFormat.GetType())
-    {
-        case wxDF_BITMAP:
-            {
-            	/*
-                wxBitmap *bitmap = (wxBitmap *)data;
-
-                HDC hdcMem = CreateCompatibleDC((HDC) NULL);
-                HDC hdcSrc = CreateCompatibleDC((HDC) NULL);
-                HBITMAP old = (HBITMAP)
-                    ::SelectObject(hdcSrc, (HBITMAP)bitmap->GetHBITMAP());
-                HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
-                                                         bitmap->GetWidth(),
-                                                         bitmap->GetHeight());
-                if (!hBitmap)
-                {
-                    SelectObject(hdcSrc, old);
-                    DeleteDC(hdcMem);
-                    DeleteDC(hdcSrc);
-                    return FALSE;
-                }
-
-                HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
-                BitBlt(hdcMem, 0, 0, bitmap->GetWidth(), bitmap->GetHeight(),
-                       hdcSrc, 0, 0, SRCCOPY);
-
-                // Select new bitmap out of memory DC
-                SelectObject(hdcMem, old1);
-
-                // Set the data
-                handle = ::SetClipboardData(CF_BITMAP, hBitmap);
-
-                // Clean up
-                SelectObject(hdcSrc, old);
-                DeleteDC(hdcSrc);
-                DeleteDC(hdcMem);
-                */
-                break;
-            }
-
-        case wxDF_DIB:
-            {
-            	/*
-#if wxUSE_IMAGE_LOADING_IN_MSW
-                wxBitmap *bitmap = (wxBitmap *)data;
-                HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
-                // NULL palette means to use the system one
-                HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL); 
-                handle = SetClipboardData(CF_DIB, hDIB);
-#endif // wxUSE_IMAGE_LOADING_IN_MSW
-*/
-                break;
-            }
-
-#if wxUSE_METAFILE
-        case wxDF_METAFILE:
-            {
-                wxMetafile *wxMF = (wxMetafile *)data;
-				PicHandle pict = wxMF->GetHMETAFILE() ;
-				HLock( (Handle) pict ) ;
-#if !TARGET_CARBON
-				err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
-#else
-				ScrapRef	scrap;
-				err = GetCurrentScrap (&scrap); 
-				if ( !err )
-				{
-					err = PutScrapFlavor (scrap, 'PICT', 0, GetHandleSize((Handle) pict), *pict);
-				}
-#endif
-				HUnlock(  (Handle) pict ) ;
-                break;
-            }
-#endif
-        case wxDF_SYLK:
-        case wxDF_DIF:
-        case wxDF_TIFF:
-        case wxDF_PALETTE:
-        default:
-            {
-                wxLogError(_("Unsupported clipboard format."));
-                return FALSE;
-            }
-
-        case wxDF_OEMTEXT:
-            dataFormat = wxDF_TEXT;
-            // fall through
-
-        case wxDF_TEXT:
-            {
-            	wxString mac ;
-            	if ( wxApp::s_macDefaultEncodingIsPC )
-            	{
-            		mac = wxMacMakeMacStringFromPC((char *)data) ;
-            	}
-            	else
-            	{
-            		mac = (char *)data ;
-            	}
-#if !TARGET_CARBON
-				err = PutScrap( mac.Length() , 'TEXT' , mac.c_str() ) ;
-#else
-				ScrapRef	scrap;
-				err = GetCurrentScrap (&scrap); 
-				if ( !err )
-				{
-					err = PutScrapFlavor (scrap, 'TEXT', 0, mac.Length(), mac.c_str());
-				}
-#endif
-                break;
-            }
-    }
-
-    if ( err )
-    {
-        wxLogSysError(_("Failed to set clipboard data."));
-
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
-{
-    return wxDataFormat();
-}
-
-int  wxRegisterClipboardFormat(wxChar *formatName)
-{
-    return 0;
-}
-
-bool wxGetClipboardFormatName(wxDataFormat dataFormat, wxChar *formatName, int maxCount)
-{
-    return FALSE;
-}
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
@@ -260,27 +42,17 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 	
     switch (dataFormat.GetType())
     {
-        case wxDF_BITMAP:
-        case wxDF_DIB:
-#if wxUSE_METAFILE
-        case wxDF_METAFILE:
-#endif
-        case wxDF_SYLK:
-        case wxDF_DIF:
-        case wxDF_TIFF:
-        case wxDF_PALETTE:
-        default:
-            {
-                wxLogError(_("Unsupported clipboard format."));
-                return NULL;
-            }
-
         case wxDF_OEMTEXT:
             dataFormat = wxDF_TEXT;
             // fall through
 
         case wxDF_TEXT:
                 break;
+        default:
+            {
+                wxLogError(_("Unsupported clipboard format."));
+                return NULL;
+            }
     }
 
 #if TARGET_CARBON
@@ -358,19 +130,37 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase)
 
 wxClipboard::wxClipboard()
 {
-    m_clearOnExit = FALSE;
+  m_open = false ;
+  m_data = NULL ;
 }
 
 wxClipboard::~wxClipboard()
 {
-    if ( m_clearOnExit )
+    if (m_data)
     {
-        Clear();
+        delete m_data;
+        m_data = (wxDataObject*) NULL;
     }
 }
 
 void wxClipboard::Clear()
 {
+    if (m_data)
+    {
+        delete m_data;
+        m_data = (wxDataObject*) NULL;
+    }
+#if TARGET_CARBON
+	OSStatus err ;
+	err = ClearCurrentScrap( );
+#else
+	OSErr err ;
+	err = ZeroScrap( );
+#endif
+	if ( err )
+	{
+        wxLogSysError(_("Failed to empty the clipboard."));
+	}
 }
 
 bool wxClipboard::Flush()
@@ -380,257 +170,229 @@ bool wxClipboard::Flush()
 
 bool wxClipboard::Open()
 {
-    return wxOpenClipboard();
+    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
+    m_open = true ;
+    return true ;
 }
 
 bool wxClipboard::IsOpened() const
 {
-    return wxIsClipboardOpened();
+    return m_open;
-}
-
-static int FormatStringToID(char *str)
-{
-  if (!strcmp(str, "TEXT"))
-    return wxDF_TEXT;
-
-  return wxRegisterClipboardFormat(str);
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
-    (void)wxEmptyClipboard();
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+
+    Clear();
 
-    if ( data )
     return AddData( data );
-    else
-        return TRUE;
 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
-#if wxUSE_DATAOBJ
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
     wxDataFormat format = data->GetPreferredFormat();
 
-    switch ( format.GetType() )
+    /* we can only store one wxDataObject */
+    Clear();
+
+    m_data = data;
+
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+    {
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard now supports atom %s"),
+                    array[i].GetId().c_str() );
+
+#if !TARGET_CARBON
+	      OSErr err = noErr ;
+#else
+	      OSStatus err = noErr ;
+#endif
+
+       switch ( array[i].GetType() )
        {
            case wxDF_TEXT:
            case wxDF_OEMTEXT:
            {
                wxTextDataObject* textDataObject = (wxTextDataObject*) data;
                wxString str(textDataObject->GetText());
-            return wxSetClipboardData(format, str.c_str());
+              	wxString mac ;
-        }
+              	if ( wxApp::s_macDefaultEncodingIsPC )
-
-        case wxDF_BITMAP:
-        case wxDF_DIB:
               	{
-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
+              		mac = wxMacMakeMacStringFromPC(textDataObject->GetText()) ;
-            wxBitmap bitmap(bitmapDataObject->GetBitmap());
+              	}
-            return wxSetClipboardData(format, &bitmap);
+              	else
+              	{
+              		mac = textDataObject->GetText() ;
+              	}
+        #if !TARGET_CARBON
+        				err = PutScrap( mac.Length() , 'TEXT' , mac.c_str() ) ;
+        #else
+        				ScrapRef	scrap;
+        				err = GetCurrentScrap (&scrap); 
+        				if ( !err )
+        				{
+        					err = PutScrapFlavor (scrap, 'TEXT', 0, mac.Length(), mac.c_str());
+        				}
+        #endif
            }
 
-#if 0 // wxUSE_METAFILE
+#if wxUSE_DRAG_AND_DROP
         case wxDF_METAFILE:
            {
               wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;
               wxMetafile metaFile = metaFileDataObject->GetMetafile();
-            return wxSetClipboardData(wxDF_METAFILE, &metaFile,
+      				PicHandle pict = metaFile->GetHMETAFILE() ;
-                                      metaFileDataObject->GetWidth(),
+      				HLock( (Handle) pict ) ;
-                                      metaFileDataObject->GetHeight());
+      #if !TARGET_CARBON
+      				err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
+      #else
+      				ScrapRef	scrap;
+      				err = GetCurrentScrap (&scrap); 
+      				if ( !err )
+      				{
+      					err = PutScrapFlavor (scrap, 'PICT', 0, GetHandleSize((Handle) pict), *pict);
       				}
-#endif // wxUSE_METAFILE
+      #endif
-
+      				HUnlock(  (Handle) pict ) ;
+           }
+#endif
+           case wxDF_BITMAP:
+           case wxDF_DIB:
            default:
- //           return wxSetClipboardData(data);
       			break ;
        }
-#else // !wxUSE_DATAOBJ
+
-#endif 
+    }
-    return FALSE;
+
+    delete[] array;
+
+    return true ;
 }
 
 void wxClipboard::Close()
 {
-    wxCloseClipboard();
+    m_open = false ;
 }
 
-bool wxClipboard::IsSupported( const wxDataFormat &format )
+bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 {
-    return wxIsClipboardFormatAvailable(format);
+  if ( m_data )
+  {
+    return m_data->IsSupported( dataFormat ) ;
+  }
+#if TARGET_CARBON
+	OSStatus err = noErr;
+	ScrapRef scrapRef;
+	
+	err = GetCurrentScrap( &scrapRef );
+	if ( err != noTypeErr && err != memFullErr )	
+	{
+		ScrapFlavorFlags	flavorFlags;
+		Size				byteCount;
+		
+		if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
+		{
+			if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
+			{
+				return TRUE ;
+			}
+		}
+	}
+	return FALSE;
+	
+#else
+	long offset ;
+	Handle datahandle = NewHandle(0) ;
+	HLock( datahandle ) ;
+	GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
+	HUnlock( datahandle ) ;
+	bool hasData = GetHandleSize( datahandle ) > 0 ;
+	DisposeHandle( datahandle ) ;
+	return hasData ;
+#endif
 }
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
-#if wxUSE_DATAOBJ
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+
+    int formatcount = data.GetFormatCount() + 1 ;
+    wxDataFormat *array = new wxDataFormat[ formatcount  ];
+    array[0] = data.GetPreferredFormat();
+    data.GetAllFormats( &array[1] );
+
+    bool transferred = false ;
+
+    if ( m_data )
+    {
+      for (size_t i = 0; !transferred && i < formatcount ; i++)
+      {
+          wxDataFormat format = array[i] ;
+          if ( m_data->IsSupported( format ) ) 
+          {
+            int size = m_data->GetDataSize( format );
+            transferred = true ;
+
+            if (size == 0) 
+            {
+              data.SetData(format , 0 , 0 ) ;
+            }
+            else
+            {
+              char *d = new char[size];
+              m_data->GetDataHere( format , (void*) d );
+              data.SetData( format , size , d ) ;
+              delete[] d ;
+            }
+          }
+       }
+    }
+    /* 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] ;
 
-    wxDataFormat format = data.GetPreferredFormat();
           switch ( format.GetType() )
           {
               case wxDF_TEXT:
               case wxDF_OEMTEXT:
               {
-            wxTextDataObject& textDataObject = (wxTextDataObject &)data;
+                  long len ;
-            char* s = (char*)wxGetClipboardData(format);
+                  char* s = (char*)wxGetClipboardData(format, &len );
-            if ( !s )
+                  if ( s )
-                return FALSE;
+                  {
-
+                    data.SetData( format , len , s ) ;
-            textDataObject.SetText(s);
                     delete [] s;
 
-            return TRUE;
+                    transferred = true ;
                   }
-
-        case wxDF_BITMAP:
-        case wxDF_DIB:
-        {
-            wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
-            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(format );
-            if ( !bitmap )
-                return FALSE;
-
-            bitmapDataObject.SetBitmap(*bitmap);
-            delete bitmap;
-
-            return TRUE;
               }
-#if 0 // wxUSE_METAFILE
+              default :
-        case wxDF_METAFILE:
-        {
-            wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
-            wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
-            if ( !metaFile )
-                return FALSE;
-
-            metaFileDataObject.SetMetafile(*metaFile);
-            delete metaFile;
-
-            return TRUE;
-        }
-#endif // wxUSE_METAFILE
-    }
-#else // !wxUSE_DATAOBJ
-    wxFAIL_MSG( wxT("no clipboard implementation") );
-#endif
-    return FALSE;
-}
-/*
-void wxClipboard::SetClipboardClient(wxClipboardClient *client, long time)
-{
-  bool got_selection;
-
-  if (clipOwner)
-    clipOwner->BeingReplaced();
-  clipOwner = client;
-  if (cbString) {
-    delete[] cbString;
-    cbString = NULL;
-  }
-
-  if (wxOpenClipboard()) {
-    char **formats, *data;
-         int i;
-    int ftype;
-    long size;
-
-    formats = clipOwner->formats.ListToArray(FALSE);
-    for (i = clipOwner->formats.Number(); i--; ) {
-      ftype = FormatStringToID(formats[i]);
-      data = clipOwner->GetData(formats[i], &size);
-      if (!wxSetClipboardData(ftype, (wxObject *)data, size, 1)) {
-        got_selection = FALSE;
                 break ;
           }
        }
-
-    if (i < 0)
-      got_selection = wxCloseClipboard();
-  } else
-    got_selection = FALSE;
-  
-  got_selection = FALSE; // Assume another process takes over
-
-  if (!got_selection) {
-    clipOwner->BeingReplaced();
-         clipOwner = NULL;
-  }
     }
 
-wxClipboardClient *wxClipboard::GetClipboardClient()
+    delete[] array ;
-{
+    return transferred ;
-  return clipOwner;
 }
-
-void wxClipboard::SetClipboardString(char *str, long time)
-{
-  bool got_selection;
-
-  if (clipOwner) {
-    clipOwner->BeingReplaced();
-    clipOwner = NULL;
-  }
-  if (cbString)
-    delete[] cbString;
-
-  cbString = str;
-
-  if (wxOpenClipboard()) {
-    if (!wxSetClipboardData(wxDF_TEXT, (wxObject *)str))
-      got_selection = FALSE;
-    else
-                got_selection = wxCloseClipboard();
-  } else
-    got_selection = FALSE;
-
-  got_selection = FALSE; // Assume another process takes over
-
-  if (!got_selection) {
-    delete[] cbString;
-    cbString = NULL;
-  }
-}
-char *wxClipboard::GetClipboardString(long time)
-{
-  char *str;
-  long length;
-
-  str = GetClipboardData("TEXT", &length, time);
-  if (!str) {
-    str = new char[1];
-    *str = 0;
-  }
-
-  return str;
-}
-
-
-char *wxClipboard::GetClipboardData(char *format, long *length, long time)
-{
-  if (clipOwner)  {
-         if (clipOwner->formats.Member(format))
-      return clipOwner->GetData(format, length);
-    else
-      return NULL;
-  } else if (cbString) {
-    if (!strcmp(format, "TEXT"))
-      return copystring(cbString);
-    else
-      return NULL;
-  } else {
-    if (wxOpenClipboard()) {
-      receivedString = (char *)wxGetClipboardData(FormatStringToID(format), 
-                                                  length);
-      wxCloseClipboard();
-    } else
-      receivedString = NULL;
-
-    return receivedString;
-  }
-}
-*/
-

src/mac/metafile.cpp

@@ -83,19 +83,21 @@ wxMetaFile::~wxMetaFile()
 
 bool wxMetaFile::SetClipboard(int width, int height)
 {
+#if wxUSE_DRAG_AND_DROP
+//TODO finishi this port , we need the data obj first
     if (!m_refData)
         return FALSE;
 
-    bool alreadyOpen=wxClipboardOpen();
+    bool alreadyOpen=wxTheClipboard->IsOpened() ;
     if (!alreadyOpen)
     {
-        wxOpenClipboard();
+        wxTheClipboard->Open();
-        if (!wxEmptyClipboard()) return FALSE;
+        if (!wxTheClipboard->Clear()) return FALSE;
     }
     bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
     if (!alreadyOpen) wxCloseClipboard();
 	    return (bool) success;
-
+#endif
     return TRUE ;
 }
 

src/mac/radiobut.cpp

@@ -81,10 +81,6 @@ void wxRadioButton::SetValue(bool val)
    				}
    			}
    		}
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
-    event.SetEventObject(this);
-    event.SetInt( GetValue() );
-    ProcessCommand(event);
 }
 
 bool wxRadioButton::GetValue() const
@@ -100,7 +96,33 @@ void wxRadioButton::Command (wxCommandEvent & event)
 
 void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
+    if ( GetValue() )
+      return ;
+      
+	  wxRadioButton *cycle, *old = NULL ;
+    cycle=this->NextInCycle();
+    if (cycle!=NULL) {
+    	  while (cycle!=this) {
+    	    if ( cycle->GetValue() ) {
+    	      old = cycle ;
+    		    cycle->SetValue(false);
+    		  }
+    		  cycle=cycle->NextInCycle();
+    		}
+    }
+
 	  SetValue(true) ;
+
+    if ( old ) {
+      wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId );
+      event.SetEventObject(old);
+      event.SetInt( false );
+      old->ProcessCommand(event);
+    }
+    wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    event2.SetEventObject(this);
+    event2.SetInt( true );
+    ProcessCommand(event2);
 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)