#include <Sound.h>
#endif
+#include "ATSUnicode.h"
+#include "TextCommon.h"
+#include "TextEncodingConverter.h"
+
#ifndef __DARWIN__
// defined in unix/utilsunx.cpp for Mac OS X
}
// Get hostname only (without domain name)
-bool wxGetHostName(char *buf, int maxSize)
+bool wxGetHostName(wxChar *buf, int maxSize)
{
// Gets Chooser name of user by examining a System resource.
const short kComputerNameID = -16413;
-
+
short oldResFile = CurResFile() ;
UseResFile(0);
StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);
if (chooserName && *chooserName)
{
- int length = (*chooserName)[0] ;
- if ( length + 1 > maxSize )
- {
- length = maxSize - 1 ;
- }
- strncpy( buf , (char*) &(*chooserName)[1] , length ) ;
- buf[length] = 0 ;
+ HLock( (Handle) chooserName ) ;
+ wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
+ HUnlock( (Handle) chooserName ) ;
+ ReleaseResource( (Handle) chooserName ) ;
+ wxStrncpy( buf , name , maxSize - 1 ) ;
}
else
buf[0] = 0 ;
}
// Get user ID e.g. jacs
-bool wxGetUserId(char *buf, int maxSize)
+bool wxGetUserId(wxChar *buf, int maxSize)
{
return wxGetUserName( buf , maxSize ) ;
}
}
// Get user name e.g. Stefan Csomor
-bool wxGetUserName(char *buf, int maxSize)
+bool wxGetUserName(wxChar *buf, int maxSize)
{
// Gets Chooser name of user by examining a System resource.
const short kChooserNameID = -16096;
-
+
short oldResFile = CurResFile() ;
UseResFile(0);
StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
if (chooserName && *chooserName)
{
- int length = (*chooserName)[0] ;
- if ( length + 1 > maxSize )
- {
- length = maxSize - 1 ;
- }
- strncpy( buf , (char*) &(*chooserName)[1] , length ) ;
- buf[length] = 0 ;
+ HLock( (Handle) chooserName ) ;
+ wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
+ HUnlock( (Handle) chooserName ) ;
+ ReleaseResource( (Handle) chooserName ) ;
+ wxStrncpy( buf , name , maxSize - 1 ) ;
}
else
buf[0] = 0 ;
return FALSE;
}
-// Shutdown or reboot the PC
+// Shutdown or reboot the PC
bool wxShutdown(wxShutdownFlags wFlags)
{
// TODO
void wxUsleep(unsigned long milliseconds)
{
clock_t start = clock() ;
- do
+ do
{
YieldToAnyThread() ;
- } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
+ } while( clock() - start < milliseconds / 1000.0 * CLOCKS_PER_SEC ) ;
}
void wxSleep(int nSecs)
{
va_list ap;
static char buffer[512];
-
+
if (!wxTheApp->GetWantDebugOutput())
return ;
-
+
va_start(ap, fmt);
-
+
vsprintf(buffer,fmt,ap) ;
strcat(buffer,";g") ;
c2pstr(buffer) ;
DebugStr((unsigned char*) buffer) ;
-
+
va_end(ap);
}
int wxGetOsVersion(int *majorVsn, int *minorVsn)
{
long theSystem ;
-
+
// are there x-platform conventions ?
-
+
Gestalt(gestaltSystemVersion, &theSystem) ;
if (minorVsn != NULL) {
*minorVsn = (theSystem & 0xFF ) ;
bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
{
- char buf[50];
- sprintf(buf, "%.4f", value);
+ wxString buf;
+ buf.Printf(wxT("%.4f"), value);
+
return wxWriteResource(section, entry, buf, file);
}
bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
{
- char buf[50];
- sprintf(buf, "%ld", value);
+ wxString buf;
+ buf.Printf(wxT("%ld"), value);
+
return wxWriteResource(section, entry, buf, file);
}
bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
{
- char buf[50];
- sprintf(buf, "%d", value);
+ wxString buf;
+ buf.Printf(wxT("%d"), value);
+
return wxWriteResource(section, entry, buf, file);
}
{
wxCHECK_RET( gs_wxBusyCursorCount > 0,
wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );
-
+
if (--gs_wxBusyCursorCount == 0)
{
gMacStoredActiveCursor.MacInstall() ;
short vRefNum ;
long dirID ;
wxString strDir ;
-
+
if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
{
FSSpec file ;
}
#ifndef __DARWIN__
-char *wxGetUserHome (const wxString& user)
+wxChar *wxGetUserHome (const wxString& user)
{
// TODO
return NULL;
{
if ( path.empty() )
return FALSE;
-
+
wxString p = path ;
if (p[0] == ':' ) {
p = wxGetCwd() + p ;
}
-
+
int pos = p.Find(':') ;
if ( pos != wxNOT_FOUND ) {
p = p.Mid(1,pos) ;
}
-
- p = p + ":" ;
-
+
+ p = p + wxT(":") ;
+
Str255 volumeName ;
XVolumeParam pb ;
{
BitMap screenBits;
GetQDGlobalsScreenBits( &screenBits );
-
- *width = screenBits.bounds.right - screenBits.bounds.left ;
- *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+
+ if (width != NULL) {
+ *width = screenBits.bounds.right - screenBits.bounds.left ;
+ }
+ if (height != NULL) {
+ *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+ }
}
void wxDisplaySizeMM(int *width, int *height)
wxDisplaySize(width, height);
// on mac 72 is fixed (at least now ;-)
float cvPt2Mm = 25.4 / 72;
- *width = int( *width * cvPt2Mm );
- *height = int( *height * cvPt2Mm );
+
+ if (width != NULL) {
+ *width = int( *width * cvPt2Mm );
+ }
+ if (height != NULL) {
+ *height = int( *height * cvPt2Mm );
+ }
}
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
if (x) *x = 0;
if (y) *y = 0;
- *width = screenBits.bounds.right - screenBits.bounds.left ;
- *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+ if (width != NULL) {
+ *width = screenBits.bounds.right - screenBits.bounds.left ;
+ }
+ if (height != NULL) {
+ *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+ }
SInt16 mheight ;
#if TARGET_CARBON
#else
mheight = LMGetMBarHeight() ;
#endif
- *height -= mheight ;
- if ( y )
+ if (height != NULL) {
+ *height -= mheight ;
+ }
+ if (y)
*y = mheight ;
}
// use configure generated description if available
return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
#else
- return "MacOS" ; //TODO:define further
+ return wxT("MacOS") ; //TODO:define further
#endif
}
}
}
-wxString wxMacMakeMacStringFromPC( const char * p )
+TECObjectRef s_TECNativeCToUnicode = NULL ;
+TECObjectRef s_TECUnicodeToNativeC = NULL ;
+TECObjectRef s_TECPlatformToNativeC = NULL ;
+TECObjectRef s_TECNativeCToPlatform = NULL ;
+void wxMacSetupConverters()
{
+ // if we assume errors are happening here we need low level debugging
+ // since the high level assert will use the encoders that are not yet
+ // setup...
+ const int kEncoding = wxApp::s_macDefaultEncodingIsPC
+ ? (int)kTextEncodingWindowsLatin1
+ : (int)kTextEncodingMacRoman;
+
+ OSStatus status = noErr ;
+ status = TECCreateConverter(&s_TECNativeCToUnicode,
+ kEncoding,
+ kTextEncodingUnicodeDefault);
+
+
+ status = TECCreateConverter(&s_TECUnicodeToNativeC,
+ kTextEncodingUnicodeDefault,
+ kEncoding);
+
+ if ( wxApp::s_macDefaultEncodingIsPC )
+ {
+ status = TECCreateConverter(&s_TECPlatformToNativeC,
+ kTextEncodingMacRoman,
+ kTextEncodingWindowsLatin1);
+
+
+ status = TECCreateConverter(&s_TECNativeCToPlatform,
+ kTextEncodingWindowsLatin1,
+ kTextEncodingMacRoman);
+ }
+}
+
+void wxMacCleanupConverters()
+{
+ OSStatus status = noErr ;
+ status = TECDisposeConverter(s_TECNativeCToUnicode);
+
+ status = TECDisposeConverter(s_TECUnicodeToNativeC);
+
+ status = TECDisposeConverter(s_TECPlatformToNativeC);
+
+ status = TECDisposeConverter(s_TECNativeCToPlatform);
+}
+
+wxWCharBuffer wxMacStringToWString( const wxString &from )
+{
+#if wxUSE_UNICODE
+ wxWCharBuffer result( from.wc_str() ) ;
+#else
+ OSStatus status = noErr ;
+ ByteCount byteOutLen ;
+ ByteCount byteInLen = from.Length() ;
+ ByteCount byteBufferLen = byteInLen *2 ;
+ wxWCharBuffer result( from.Length() ) ;
+ status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from.c_str() , byteInLen, &byteInLen,
+ (TextPtr)result.data(), byteBufferLen, &byteOutLen);
+ result.data()[byteOutLen/2] = 0 ;
+#endif
+ return result ;
+}
+
+wxString wxMacMakeStringFromCString( const char * from , int len )
+{
+ OSStatus status = noErr ;
wxString result ;
- int len = strlen ( p ) ;
+ wxChar* buf = result.GetWriteBuf( len ) ;
+#if wxUSE_UNICODE
+ ByteCount byteOutLen ;
+ ByteCount byteInLen = len ;
+ ByteCount byteBufferLen = len *2 ;
+
+ status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from , byteInLen, &byteInLen,
+ (TextPtr)buf, byteBufferLen, &byteOutLen);
+#else
+ if ( !wxApp::s_macDefaultEncodingIsPC )
+ memcpy( buf , from , len ) ;
+ else
+ {
+ ByteCount byteOutLen ;
+ ByteCount byteInLen = len ;
+ ByteCount byteBufferLen = byteInLen ;
+
+ status = TECConvertText(s_TECPlatformToNativeC, (ConstTextPtr)from , byteInLen, &byteInLen,
+ (TextPtr)buf, byteBufferLen, &byteOutLen);
+ }
+#endif
+ buf[len] = 0 ;
+ result.UngetWriteBuf() ;
+ return result ;
+}
+
+wxString wxMacMakeStringFromCString( const char * from )
+{
+ return wxMacMakeStringFromCString( from , strlen(from) ) ;
+}
+
+wxCharBuffer wxMacStringToCString( const wxString &from )
+{
+#if wxUSE_UNICODE
+ OSStatus status = noErr ;
+ ByteCount byteOutLen ;
+ ByteCount byteInLen = from.Length() * 2 ;
+ ByteCount byteBufferLen = from.Length() ;
+ wxCharBuffer result( from.Length() ) ;
+ status = TECConvertText(s_TECUnicodeToNativeC , (ConstTextPtr)from.wc_str() , byteInLen, &byteInLen,
+ (TextPtr)result.data(), byteBufferLen, &byteOutLen);
+ return result ;
+#else
+ if ( !wxApp::s_macDefaultEncodingIsPC )
+ return wxCharBuffer( from.c_str() ) ;
+ else
+ {
+ wxCharBuffer result( from.Length() ) ;
+ OSStatus status = noErr ;
+ ByteCount byteOutLen ;
+ ByteCount byteInLen = from.Length() ;
+ ByteCount byteBufferLen = byteInLen ;
+
+ status = TECConvertText(s_TECNativeCToPlatform, (ConstTextPtr)from.c_str() , byteInLen, &byteInLen,
+ (TextPtr)result.data(), byteBufferLen, &byteOutLen);
+ return result ;
+ }
+#endif
+}
+
+void wxMacStringToPascal( const wxString&from , StringPtr to )
+{
+ wxCharBuffer buf = wxMacStringToCString( from ) ;
+ int len = strlen(buf) ;
+
+ if ( len > 255 )
+ len = 255 ;
+ to[0] = len ;
+ memcpy( (char*) &to[1] , buf , len ) ;
+}
+
+wxString wxMacMakeStringFromPascal( ConstStringPtr from )
+{
+ return wxMacMakeStringFromCString( (char*) &from[1] , from[0] ) ;
+}
+
+//
+// CFStringRefs (Carbon only)
+//
+
+#if TARGET_CARBON
+// converts this string into a carbon foundation string with optional pc 2 mac encoding
+void wxMacCFStringHolder::Assign( const wxString &str )
+{
+#if wxUSE_UNICODE
+ m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,
+ (const unsigned short*)str.wc_str(), str.Len() );
+#else
+ m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
+ wxApp::s_macDefaultEncodingIsPC ?
+ kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
+#endif
+ m_release = true ;
+}
+
+wxString wxMacCFStringHolder::AsString()
+{
+ wxString result ;
+ Size len = CFStringGetLength( m_cfs ) ;
+ wxChar* buf = result.GetWriteBuf( len ) ;
+#if wxUSE_UNICODE
+ CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
+#else
+ CFStringGetCString( m_cfs , buf , len+1 , wxApp::s_macDefaultEncodingIsPC ?
+ kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
+#endif
+ buf[len] = 0 ;
+ result.UngetWriteBuf() ;
+ return result ;
+}
+
+#if 0
+
+wxString wxMacMakeMacStringFromPC( const wxChar * p )
+{
+ wxString result ;
+ int len = wxStrlen ( p ) ;
if ( len > 0 )
{
wxChar* ptr = result.GetWriteBuf(len) ;
return result ;
}
-wxString wxMacMakePCStringFromMac( const char * p )
+wxString wxMacMakePCStringFromMac( const wxChar * p )
{
wxString result ;
- int len = strlen ( p ) ;
+ int len = wxStrlen ( p ) ;
if ( len > 0 )
{
wxChar* ptr = result.GetWriteBuf(len) ;
return result ;
}
-wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding )
+wxString wxMacMakeStringFromMacString( const wxChar* from , bool mac2pcEncoding )
{
if (mac2pcEncoding)
{
}
}
-//
+//
// Pascal Strings
//
}
}
-void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding )
+void wxMacStringToPascal( const wxChar * from , StringPtr to , bool pc2macEncoding )
{
if (pc2macEncoding)
{
CopyCStringToPascal( from , to ) ;
}
}
+#endif
-//
-// CFStringRefs (Carbon only)
-//
-
-#if TARGET_CARBON
-// converts this string into a carbon foundation string with optional pc 2 mac encoding
-CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding )
-{
- return CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
- pc2macEncoding ?
- kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
-}
#endif //TARGET_CARBON
projects / wxWidgets.git / blobdiff