Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMac Unicode support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-03-27 20:33:32 +00:00
parent 44c44c82a3
commit 427ff66291
99 changed files with 1718 additions and 2166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/mac/dataobj.cpp
View File

@@ -1,11 +1,11 @@
///////////////////////////////////////////////////////////////////////////////
// Name: os2/dataobj.cpp
// Purpose: implementation of wx[I]DataObject class
// Author: David Webster
// Name: mac/dataobj.cpp
// Purpose: implementation of wxDataObject class
// Author: Stefan Csomor
// Modified by:
// Created: 10/21/99
// RCS-ID: $Id$
// Copyright: (c) 1999 David Webster
// Copyright: (c) 1999 Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -34,6 +34,7 @@
#include "wx/mstream.h"
#include "wx/image.h"
#include "wx/mac/private.h"
#include "Scrap.h"
// ----------------------------------------------------------------------------
// functions
@@ -73,10 +74,12 @@ void wxDataFormat::SetType( wxDataFormatId Type )
{
m_type = Type;
if (m_type == wxDF_TEXT)
m_format = 'TEXT';
if (m_type == wxDF_TEXT )
m_format = kScrapFlavorTypeText;
else if (m_type == wxDF_UNICODETEXT )
m_format = kScrapFlavorTypeUnicode ;
else if (m_type == wxDF_BITMAP || m_type == wxDF_METAFILE )
m_format = 'PICT';
m_format = kScrapFlavorTypePicture;
else if (m_type == wxDF_FILENAME)
m_format = kDragFlavorTypeHFS ;
else
@@ -92,18 +95,23 @@ wxDataFormatId wxDataFormat::GetType() const
wxString wxDataFormat::GetId() const
{
wxString sRet(""); // TODO: to name of ( m_format ) );
return sRet;
char text[5] ;
strncpy( text , (char*) m_format , 4 ) ;
text[4] = 0 ;
return wxString::FromAscii( text ) ;
}
void wxDataFormat::SetId( NativeFormat format )
{
m_format = format;
if (m_format == 'TEXT')
if (m_format == kScrapFlavorTypeText)
m_type = wxDF_TEXT;
else
if (m_format == 'PICT')
if (m_format == kScrapFlavorTypeUnicode )
m_type = wxDF_UNICODETEXT;
else
if (m_format == kScrapFlavorTypePicture)
m_type = wxDF_BITMAP;
else
if (m_format == kDragFlavorTypeHFS )
@@ -201,9 +209,7 @@ bool wxFileDataObject::SetData(
{
m_filenames.Empty();
wxString sFile( (const char *)pBuf); /* char, not wxChar */
AddFile(sFile);
AddFile(wxString::FromAscii((char*)pBuf));
return TRUE;
}