/////////////////////////////////////////////////////////////////////////////
-// Name: utils.cpp
+// Name: src/mac/carbon/utils.cpp
// Purpose: Various utilities
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-// Note: this is done in utilscmn.cpp now.
-// #pragma implementation "utils.h"
-#endif
+#include "wx/wxprec.h"
-#include "wx/setup.h"
#include "wx/utils.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/app.h"
+ #if wxUSE_GUI
+ #include "wx/toplevel.h"
+ #include "wx/font.h"
+ #endif
+#endif
+
#include "wx/apptrait.h"
#if wxUSE_GUI
#include "wx/mac/uma.h"
- #include "wx/font.h"
-#else
- #include "wx/intl.h"
#endif
#include <ctype.h>
#include <string.h>
#include <stdarg.h>
-#ifdef __DARWIN__
-# include "MoreFilesX.h"
-#else
-# include "MoreFiles.h"
-# include "MoreFilesExtras.h"
-#endif
+#include "MoreFilesX.h"
#ifndef __DARWIN__
-#include <Threads.h>
-#include <Sound.h>
+ #include <Threads.h>
+ #include <Sound.h>
#endif
+#if wxUSE_GUI
#if TARGET_API_MAC_OSX
-#include <CoreServices/CoreServices.h>
+ #include <CoreServices/CoreServices.h>
+#else
+ #include <DriverServices.h>
+ #include <Multiprocessing.h>
+#endif
+
+#ifdef __DARWIN__
+ #include <Carbon/Carbon.h>
#else
-#include <DriverServices.h>
-#include <Multiprocessing.h>
+ #include <ATSUnicode.h>
+ #include <TextCommon.h>
+ #include <TextEncodingConverter.h>
#endif
-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
+#include "wx/mac/private/timer.h"
+#endif // wxUSE_GUI
-#include "wx/mac/private.h" // includes mac headers
+#include "wx/evtloop.h"
+#include "wx/mac/private.h"
#if defined(__MWERKS__) && wxUSE_UNICODE
+#if __MWERKS__ < 0x4100 || !defined(__DARWIN__)
#include <wtime.h>
#endif
+#endif
-// ---------------------------------------------------------------------------
-// code used in both base and GUI compilation
-// ---------------------------------------------------------------------------
+#if wxUSE_BASE
// our OS version is the same in non GUI and GUI cases
-static int DoGetOSVersion(int *majorVsn, int *minorVsn)
+wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
{
- long theSystem ;
+ SInt32 theSystem;
+ Gestalt(gestaltSystemVersion, &theSystem);
- // are there x-platform conventions ?
+ if ( majorVsn != NULL )
+ *majorVsn = (theSystem >> 8);
- Gestalt(gestaltSystemVersion, &theSystem) ;
- if (minorVsn != NULL) {
- *minorVsn = (theSystem & 0xFF ) ;
- }
- if (majorVsn != NULL) {
- *majorVsn = (theSystem >> 8 ) ;
- }
-#ifdef __DARWIN__
- return wxMAC_DARWIN;
+ if ( minorVsn != NULL )
+ *minorVsn = (theSystem & 0xFF);
+
+#if defined( __DARWIN__ )
+ return wxOS_MAC_OSX_DARWIN;
#else
- return wxMAC;
+ return wxOS_MAC_OS;
#endif
}
-
-#if wxUSE_BASE
-
// ----------------------------------------------------------------------------
// debugging support
// ----------------------------------------------------------------------------
-#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+#if defined(__WXDEBUG__) && defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
#if TARGET_API_MAC_CARBON
- #include <CodeFragments.h>
+#include <CodeFragments.h>
- extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
- ProcPtr gCallUniversalProc_Proc = NULL;
+ProcPtr gCallUniversalProc_Proc = NULL;
#endif
static long fRunOnce = false;
-/* ---------------------------------------------------------------------------
- IsMetroNubInstalled
- --------------------------------------------------------------------------- */
Boolean IsMetroNubInstalled()
{
if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
{
- /* look for MetroNub's Gestalt selector */
+ // look for MetroNub's Gestalt selector
if (Gestalt(kMetroNubUserSignature, &result) == noErr)
{
-
- #if TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_CARBON
if (gCallUniversalProc_Proc == NULL)
{
CFragConnectionID connectionID;
goto end;
}
}
- #endif
+#endif
{
MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
- /* make sure the version of the API is compatible */
+ // make sure the version of the API is compatible
if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
kMetroNubUserAPIVersion <= block->apiHiVersion)
- gMetroNubEntry = block; /* success! */
+ {
+ // success!
+ gMetroNubEntry = block;
+ }
}
-
}
}
}
#endif
}
-/* ---------------------------------------------------------------------------
- IsMWDebuggerRunning [v1 API]
- --------------------------------------------------------------------------- */
-
Boolean IsMWDebuggerRunning()
{
if (IsMetroNubInstalled())
return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
- else
- return false;
-}
-/* ---------------------------------------------------------------------------
- AmIBeingMWDebugged [v1 API]
- --------------------------------------------------------------------------- */
+ return false;
+}
Boolean AmIBeingMWDebugged()
{
if (IsMetroNubInstalled())
return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
- else
- return false;
+
+ return false;
}
extern bool WXDLLEXPORT wxIsDebuggerRunning()
return wxGetHostName(buf, maxSize);
}
+// Get user ID e.g. jacs
+bool wxGetUserId(wxChar *buf, int maxSize)
+{
+ return wxGetUserName( buf , maxSize );
+}
+
+const wxChar* wxGetHomeDir(wxString *pstr)
+{
+ *pstr = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder );
+ return pstr->c_str();
+}
+
// Get hostname only (without domain name)
bool wxGetHostName(wxChar *buf, int maxSize)
{
// Gets Chooser name of user by examining a System resource.
+ buf[0] = 0;
const short kComputerNameID = -16413;
- short oldResFile = CurResFile() ;
+ short oldResFile = CurResFile();
UseResFile(0);
StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);
UseResFile(oldResFile);
if (chooserName && *chooserName)
{
- HLock( (Handle) chooserName ) ;
- wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
- HUnlock( (Handle) chooserName ) ;
- ReleaseResource( (Handle) chooserName ) ;
- wxStrncpy( buf , name , maxSize - 1 ) ;
+ HLock( (Handle) chooserName );
+ wxString name = wxMacMakeStringFromPascal( *chooserName );
+ HUnlock( (Handle) chooserName );
+ ReleaseResource( (Handle) chooserName );
+ wxStrncpy( buf , name , maxSize - 1 );
}
- else
- buf[0] = 0 ;
-
- return TRUE;
-}
-
-// Get user ID e.g. jacs
-bool wxGetUserId(wxChar *buf, int maxSize)
-{
- return wxGetUserName( buf , maxSize ) ;
-}
-const wxChar* wxGetHomeDir(wxString *pstr)
-{
- *pstr = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
- return pstr->c_str() ;
+ return true;
}
// Get user name e.g. Stefan Csomor
bool wxGetUserName(wxChar *buf, int maxSize)
{
// Gets Chooser name of user by examining a System resource.
+ buf[0] = 0;
const short kChooserNameID = -16096;
- short oldResFile = CurResFile() ;
+ short oldResFile = CurResFile();
UseResFile(0);
StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
UseResFile(oldResFile);
if (chooserName && *chooserName)
{
- HLock( (Handle) chooserName ) ;
- wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
- HUnlock( (Handle) chooserName ) ;
- ReleaseResource( (Handle) chooserName ) ;
- wxStrncpy( buf , name , maxSize - 1 ) ;
+ HLock( (Handle) chooserName );
+ wxString name = wxMacMakeStringFromPascal( *chooserName );
+ HUnlock( (Handle) chooserName );
+ ReleaseResource( (Handle) chooserName );
+ wxStrncpy( buf , name , maxSize - 1 );
}
- else
- buf[0] = 0 ;
- return TRUE;
+ return true;
}
-int wxKill(long pid, wxSignal sig , wxKillError *rc )
+int wxKill(long pid, wxSignal sig , wxKillError *rc, int flags)
{
// TODO
return 0;
WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
{
// TODO : under classic there is no environement support, under X yes
- return false ;
+ return false;
}
-// set the env var name to the given value, return TRUE on success
+// set the env var name to the given value, return true on success
WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
{
// TODO : under classic there is no environement support, under X yes
- return false ;
+ return false;
}
-//
// Execute a program in an Interactive Shell
-//
bool wxShell(const wxString& command)
{
// TODO
- return FALSE;
+ return false;
}
// Shutdown or reboot the PC
bool wxShutdown(wxShutdownFlags wFlags)
{
// TODO
- return FALSE;
+ return false;
}
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
{
- return FreeMem() ;
+ return (wxMemorySize)FreeMem();
}
#ifndef __DARWIN__
void wxMicroSleep(unsigned long microseconds)
{
- AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime());
- MPDelayUntil( & wakeup);
+ AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime());
+ MPDelayUntil( & wakeup);
}
void wxMilliSleep(unsigned long milliseconds)
{
- AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime());
- MPDelayUntil( & wakeup);
+ AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime());
+ MPDelayUntil( & wakeup);
}
void wxSleep(int nSecs)
// Emit a beeeeeep
void wxBell()
{
+#ifndef __LP64__
SysBeep(30);
+#endif
}
-wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
-{
- static wxToolkitInfo info;
- info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
- info.name = _T("wxBase");
- return info;
-}
#endif // wxUSE_BASE
#if wxUSE_GUI
-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
-{
- static wxToolkitInfo info;
- info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
- info.shortName = _T("mac");
- info.name = _T("wxMac");
-#ifdef __WXUNIVERSAL__
- info.shortName << _T("univ");
- info.name << _T("/wxUniversal");
-#endif
- return info;
-}
-
-// Reading and writing resources (eg WIN.INI, .Xdefaults)
-#if wxUSE_RESOURCES
-bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
-{
- // TODO
- return FALSE;
-}
-
-bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
-{
- 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)
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
{
- wxString buf;
- buf.Printf(wxT("%ld"), value);
+ // We suppose that toolkit version is the same as OS version under Mac
+ wxGetOsVersion(verMaj, verMin);
- return wxWriteResource(section, entry, buf, file);
+ return wxPORT_MAC;
}
-bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
{
- wxString buf;
- buf.Printf(wxT("%d"), value);
-
- return wxWriteResource(section, entry, buf, file);
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
-{
- // TODO
- return FALSE;
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
-{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- *value = (float)strtod(s, NULL);
- delete[] s;
- return TRUE;
- }
- else return FALSE;
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
-{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- *value = strtol(s, NULL, 10);
- delete[] s;
- return TRUE;
- }
- else return FALSE;
+ return new wxEventLoop;
}
-bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
+wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- *value = (int)strtol(s, NULL, 10);
- delete[] s;
- return TRUE;
- }
- else return FALSE;
+ return new wxCarbonTimerImpl(timer);
}
-#endif // wxUSE_RESOURCES
int gs_wxBusyCursorCount = 0;
-extern wxCursor gMacCurrentCursor ;
-wxCursor gMacStoredActiveCursor ;
+extern wxCursor gMacCurrentCursor;
+wxCursor gMacStoredActiveCursor;
// Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)
{
if (gs_wxBusyCursorCount++ == 0)
{
- gMacStoredActiveCursor = gMacCurrentCursor ;
- cursor->MacInstall() ;
+ gMacStoredActiveCursor = gMacCurrentCursor;
+ cursor->MacInstall();
}
//else: nothing to do, already set
}
if (--gs_wxBusyCursorCount == 0)
{
- gMacStoredActiveCursor.MacInstall() ;
- gMacStoredActiveCursor = wxNullCursor ;
+ gMacStoredActiveCursor.MacInstall();
+ gMacStoredActiveCursor = wxNullCursor;
}
}
-// TRUE if we're between the above two calls
+// true if we're between the above two calls
bool wxIsBusy()
{
return (gs_wxBusyCursorCount > 0);
#if wxUSE_BASE
-wxString wxMacFindFolder( short vol,
+wxString wxMacFindFolderNoSeparator( short vol,
OSType folderType,
Boolean createFolder)
{
- short vRefNum ;
- long dirID ;
- wxString strDir ;
+ FSRef fsRef;
+ wxString strDir;
- if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
+ if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)
{
- FSSpec file ;
- if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
- {
- strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
- }
+ strDir = wxMacFSRefToPath( &fsRef );
}
- return strDir ;
+
+ return strDir;
+}
+
+wxString wxMacFindFolder( short vol,
+ OSType folderType,
+ Boolean createFolder)
+{
+ return wxMacFindFolderNoSeparator(vol, folderType, createFolder) + wxFILE_SEP_PATH;
}
#endif // wxUSE_BASE
bool wxCheckForInterrupt(wxWindow *wnd)
{
// TODO
- return FALSE;
+ return false;
}
void wxGetMousePosition( int* x, int* y )
{
- Point pt ;
-
- GetMouse( &pt ) ;
- LocalToGlobal( &pt ) ;
- *x = pt.h ;
- *y = pt.v ;
+ Point pt;
+#if wxMAC_USE_CORE_GRAPHICS
+ GetGlobalMouse(&pt);
+#else
+ GetMouse( &pt );
+ LocalToGlobal( &pt );
+#endif
+ *x = pt.h;
+ *y = pt.v;
};
-// Return TRUE if we have a colour display
+// Return true if we have a colour display
bool wxColourDisplay()
{
- return TRUE;
+ return true;
}
// Returns depth of screen
int wxDisplayDepth()
{
- Rect globRect ;
+ int theDepth = 8;
+#if wxMAC_USE_CORE_GRAPHICS
+ theDepth = (int) CGDisplayBitsPerPixel(CGMainDisplayID());
+#else
+ Rect globRect;
SetRect(&globRect, -32760, -32760, 32760, 32760);
GDHandle theMaxDevice;
- int theDepth = 8;
theMaxDevice = GetMaxDevice(&globRect);
- if (theMaxDevice != nil)
+ if (theMaxDevice != NULL)
theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
-
- return theDepth ;
+#endif
+ return theDepth;
}
// Get size of display
void wxDisplaySize(int *width, int *height)
{
+#if wxMAC_USE_CORE_GRAPHICS
+ // TODO adapt for multi-displays
+ CGRect bounds = CGDisplayBounds(CGMainDisplayID());
+ if ( width )
+ *width = (int)bounds.size.width ;
+ if ( height )
+ *height = (int)bounds.size.height;
+#else
BitMap screenBits;
GetQDGlobalsScreenBits( &screenBits );
- if (width != NULL) {
- *width = screenBits.bounds.right - screenBits.bounds.left ;
- }
- if (height != NULL) {
- *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;
+#endif
}
void wxDisplaySizeMM(int *width, int *height)
{
wxDisplaySize(width, height);
- // on mac 72 is fixed (at least now ;-)
+ // on mac 72 is fixed (at least now;-)
float cvPt2Mm = 25.4 / 72;
- if (width != NULL) {
+ if (width != NULL)
*width = int( *width * cvPt2Mm );
- }
- if (height != NULL) {
+
+ if (height != NULL)
*height = int( *height * cvPt2Mm );
- }
}
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{
- Rect r ;
- GetAvailableWindowPositioningBounds( GetMainDevice() , &r ) ;
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+ HIRect bounds ;
+ HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal,
+ &bounds);
+ if ( x )
+ *x = bounds.origin.x;
+ if ( y )
+ *y = bounds.origin.y;
+ if ( width )
+ *width = bounds.size.width;
+ if ( height )
+ *height = bounds.size.height;
+#else
+ Rect r;
+ GetAvailableWindowPositioningBounds( GetMainDevice() , &r );
if ( x )
- *x = r.left ;
+ *x = r.left;
if ( y )
- *y = r.top ;
+ *y = r.top;
if ( width )
- *width = r.right - r.left ;
+ *width = r.right - r.left;
if ( height )
- *height = r.bottom - r.top ;
+ *height = r.bottom - r.top;
+#endif
}
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
// use configure generated description if available
return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
#else
- return wxT("MacOS") ; //TODO:define further
+ return wxT("MacOS"); //TODO:define further
#endif
}
return NULL;
}
-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
{
if ( path.empty() )
- return FALSE;
+ return false;
- wxString p = path ;
- if (p[0u] == ':' ) {
- p = wxGetCwd() + p ;
- }
+ wxString p = path;
+ if (p[0u] == ':' )
+ p = wxGetCwd() + p;
- int pos = p.Find(':') ;
- if ( pos != wxNOT_FOUND ) {
- p = p.Mid(1,pos) ;
- }
+ int pos = p.Find(':');
+ if ( pos != wxNOT_FOUND )
+ p = p.Mid(1,pos);
- p = p + wxT(":") ;
+ p = p + wxT(":");
- Str255 volumeName ;
- XVolumeParam pb ;
+ OSErr err = noErr;
- wxMacStringToPascal( p , volumeName ) ;
- OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
- if ( err == noErr ) {
- if ( pTotal ) {
- (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
- }
- if ( pFree ) {
- (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
- }
+ FSRef fsRef;
+ err = wxMacPathToFSRef( p , &fsRef );
+ if ( noErr == err )
+ {
+ FSVolumeRefNum vRefNum;
+ err = FSGetVRefNum( &fsRef , &vRefNum );
+ if ( noErr == err )
+ {
+ UInt64 freeBytes , totalBytes;
+ err = FSGetVInfo( vRefNum , NULL , &freeBytes , &totalBytes );
+ if ( noErr == err )
+ {
+ if ( pTotal )
+ *pTotal = wxDiskspaceSize_t( totalBytes );
+ if ( pFree )
+ *pFree = wxDiskspaceSize_t( freeBytes );
+ }
+ }
}
- return err == noErr ;
+ return err == noErr;
}
#endif // !__DARWIN__
void wxMacStringToPascal( const wxString&from , StringPtr to )
{
- wxCharBuffer buf = from.mb_str( wxConvLocal ) ;
- int len = strlen(buf) ;
+ wxCharBuffer buf = from.mb_str( wxConvLocal );
+ int len = strlen(buf);
if ( len > 255 )
- len = 255 ;
- to[0] = len ;
- memcpy( (char*) &to[1] , buf , len ) ;
+ len = 255;
+ to[0] = len;
+ memcpy( (char*) &to[1] , buf , len );
}
wxString wxMacMakeStringFromPascal( ConstStringPtr from )
{
- return wxString( (char*) &from[1] , wxConvLocal , from[0] ) ;
-}
-
-
-wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
-{
- TextEncodingBase enc = 0 ;
- if ( encoding == wxFONTENCODING_DEFAULT )
- {
-#if wxUSE_GUI
- encoding = wxFont::GetDefaultEncoding() ;
-#else
- encoding = wxLocale::GetSystemEncoding() ;
-#endif
- }
-
- switch( encoding)
- {
- case wxFONTENCODING_ISO8859_1 :
- enc = kTextEncodingISOLatin1 ;
- break ;
- case wxFONTENCODING_ISO8859_2 :
- enc = kTextEncodingISOLatin2;
- break ;
- case wxFONTENCODING_ISO8859_3 :
- enc = kTextEncodingISOLatin3 ;
- break ;
- case wxFONTENCODING_ISO8859_4 :
- enc = kTextEncodingISOLatin4;
- break ;
- case wxFONTENCODING_ISO8859_5 :
- enc = kTextEncodingISOLatinCyrillic;
- break ;
- case wxFONTENCODING_ISO8859_6 :
- enc = kTextEncodingISOLatinArabic;
- break ;
- case wxFONTENCODING_ISO8859_7 :
- enc = kTextEncodingISOLatinGreek;
- break ;
- case wxFONTENCODING_ISO8859_8 :
- enc = kTextEncodingISOLatinHebrew;
- break ;
- case wxFONTENCODING_ISO8859_9 :
- enc = kTextEncodingISOLatin5;
- break ;
- case wxFONTENCODING_ISO8859_10 :
- enc = kTextEncodingISOLatin6;
- break ;
- case wxFONTENCODING_ISO8859_13 :
- enc = kTextEncodingISOLatin7;
- break ;
- case wxFONTENCODING_ISO8859_14 :
- enc = kTextEncodingISOLatin8;
- break ;
- case wxFONTENCODING_ISO8859_15 :
- enc = kTextEncodingISOLatin9;
- break ;
-
- case wxFONTENCODING_KOI8 :
- enc = kTextEncodingKOI8_R;
- break ;
- case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
- enc = kTextEncodingDOSRussian;
- break ;
-/*
- case wxFONTENCODING_BULGARIAN :
- enc = ;
- break ;
-*/
- case wxFONTENCODING_CP437 :
- enc =kTextEncodingDOSLatinUS ;
- break ;
- case wxFONTENCODING_CP850 :
- enc = kTextEncodingDOSLatin1;
- break ;
- case wxFONTENCODING_CP852 :
- enc = kTextEncodingDOSLatin2;
- break ;
- case wxFONTENCODING_CP855 :
- enc = kTextEncodingDOSCyrillic;
- break ;
- case wxFONTENCODING_CP866 :
- enc =kTextEncodingDOSRussian ;
- break ;
- case wxFONTENCODING_CP874 :
- enc = kTextEncodingDOSThai;
- break ;
- case wxFONTENCODING_CP932 :
- enc = kTextEncodingDOSJapanese;
- break ;
- case wxFONTENCODING_CP936 :
- enc =kTextEncodingDOSChineseSimplif ;
- break ;
- case wxFONTENCODING_CP949 :
- enc = kTextEncodingDOSKorean;
- break ;
- case wxFONTENCODING_CP950 :
- enc = kTextEncodingDOSChineseTrad;
- break ;
-
- case wxFONTENCODING_CP1250 :
- enc = kTextEncodingWindowsLatin2;
- break ;
- case wxFONTENCODING_CP1251 :
- enc =kTextEncodingWindowsCyrillic ;
- break ;
- case wxFONTENCODING_CP1252 :
- enc =kTextEncodingWindowsLatin1 ;
- break ;
- case wxFONTENCODING_CP1253 :
- enc = kTextEncodingWindowsGreek;
- break ;
- case wxFONTENCODING_CP1254 :
- enc = kTextEncodingWindowsLatin5;
- break ;
- case wxFONTENCODING_CP1255 :
- enc =kTextEncodingWindowsHebrew ;
- break ;
- case wxFONTENCODING_CP1256 :
- enc =kTextEncodingWindowsArabic ;
- break ;
- case wxFONTENCODING_CP1257 :
- enc = kTextEncodingWindowsBalticRim;
- break ;
-
- case wxFONTENCODING_UTF7 :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
- break ;
- case wxFONTENCODING_UTF8 :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
- break ;
- case wxFONTENCODING_EUC_JP :
- enc = kTextEncodingEUC_JP;
- break ;
- case wxFONTENCODING_UTF16BE :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
- break ;
- case wxFONTENCODING_UTF16LE :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
- break ;
- case wxFONTENCODING_UTF32BE :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
- break ;
- case wxFONTENCODING_UTF32LE :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
- break ;
-
- case wxFONTENCODING_MACROMAN :
- enc = kTextEncodingMacRoman ;
- break ;
- case wxFONTENCODING_MACJAPANESE :
- enc = kTextEncodingMacJapanese ;
- break ;
- case wxFONTENCODING_MACCHINESETRAD :
- enc = kTextEncodingMacChineseTrad ;
- break ;
- case wxFONTENCODING_MACKOREAN :
- enc = kTextEncodingMacKorean ;
- break ;
- case wxFONTENCODING_MACARABIC :
- enc = kTextEncodingMacArabic ;
- break ;
- case wxFONTENCODING_MACHEBREW :
- enc = kTextEncodingMacHebrew ;
- break ;
- case wxFONTENCODING_MACGREEK :
- enc = kTextEncodingMacGreek ;
- break ;
- case wxFONTENCODING_MACCYRILLIC :
- enc = kTextEncodingMacCyrillic ;
- break ;
- case wxFONTENCODING_MACDEVANAGARI :
- enc = kTextEncodingMacDevanagari ;
- break ;
- case wxFONTENCODING_MACGURMUKHI :
- enc = kTextEncodingMacGurmukhi ;
- break ;
- case wxFONTENCODING_MACGUJARATI :
- enc = kTextEncodingMacGujarati ;
- break ;
- case wxFONTENCODING_MACORIYA :
- enc = kTextEncodingMacOriya ;
- break ;
- case wxFONTENCODING_MACBENGALI :
- enc = kTextEncodingMacBengali ;
- break ;
- case wxFONTENCODING_MACTAMIL :
- enc = kTextEncodingMacTamil ;
- break ;
- case wxFONTENCODING_MACTELUGU :
- enc = kTextEncodingMacTelugu ;
- break ;
- case wxFONTENCODING_MACKANNADA :
- enc = kTextEncodingMacKannada ;
- break ;
- case wxFONTENCODING_MACMALAJALAM :
- enc = kTextEncodingMacMalayalam ;
- break ;
- case wxFONTENCODING_MACSINHALESE :
- enc = kTextEncodingMacSinhalese ;
- break ;
- case wxFONTENCODING_MACBURMESE :
- enc = kTextEncodingMacBurmese ;
- break ;
- case wxFONTENCODING_MACKHMER :
- enc = kTextEncodingMacKhmer ;
- break ;
- case wxFONTENCODING_MACTHAI :
- enc = kTextEncodingMacThai ;
- break ;
- case wxFONTENCODING_MACLAOTIAN :
- enc = kTextEncodingMacLaotian ;
- break ;
- case wxFONTENCODING_MACGEORGIAN :
- enc = kTextEncodingMacGeorgian ;
- break ;
- case wxFONTENCODING_MACARMENIAN :
- enc = kTextEncodingMacArmenian ;
- break ;
- case wxFONTENCODING_MACCHINESESIMP :
- enc = kTextEncodingMacChineseSimp ;
- break ;
- case wxFONTENCODING_MACTIBETAN :
- enc = kTextEncodingMacTibetan ;
- break ;
- case wxFONTENCODING_MACMONGOLIAN :
- enc = kTextEncodingMacMongolian ;
- break ;
- case wxFONTENCODING_MACETHIOPIC :
- enc = kTextEncodingMacEthiopic ;
- break ;
- case wxFONTENCODING_MACCENTRALEUR :
- enc = kTextEncodingMacCentralEurRoman ;
- break ;
- case wxFONTENCODING_MACVIATNAMESE :
- enc = kTextEncodingMacVietnamese ;
- break ;
- case wxFONTENCODING_MACARABICEXT :
- enc = kTextEncodingMacExtArabic ;
- break ;
- case wxFONTENCODING_MACSYMBOL :
- enc = kTextEncodingMacSymbol ;
- break ;
- case wxFONTENCODING_MACDINGBATS :
- enc = kTextEncodingMacDingbats ;
- break ;
- case wxFONTENCODING_MACTURKISH :
- enc = kTextEncodingMacTurkish ;
- break ;
- case wxFONTENCODING_MACCROATIAN :
- enc = kTextEncodingMacCroatian ;
- break ;
- case wxFONTENCODING_MACICELANDIC :
- enc = kTextEncodingMacIcelandic ;
- break ;
- case wxFONTENCODING_MACROMANIAN :
- enc = kTextEncodingMacRomanian ;
- break ;
- case wxFONTENCODING_MACCELTIC :
- enc = kTextEncodingMacCeltic ;
- break ;
- case wxFONTENCODING_MACGAELIC :
- enc = kTextEncodingMacGaelic ;
- break ;
- case wxFONTENCODING_MACKEYBOARD :
- enc = kTextEncodingMacKeyboardGlyphs ;
- break ;
- default :
- // to make gcc happy
- break ;
- } ;
- return enc ;
-}
-
-wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
-{
- wxFontEncoding enc = wxFONTENCODING_DEFAULT ;
-
- switch( encoding)
- {
- case kTextEncodingISOLatin1 :
- enc = wxFONTENCODING_ISO8859_1 ;
- break ;
- case kTextEncodingISOLatin2 :
- enc = wxFONTENCODING_ISO8859_2;
- break ;
- case kTextEncodingISOLatin3 :
- enc = wxFONTENCODING_ISO8859_3 ;
- break ;
- case kTextEncodingISOLatin4 :
- enc = wxFONTENCODING_ISO8859_4;
- break ;
- case kTextEncodingISOLatinCyrillic :
- enc = wxFONTENCODING_ISO8859_5;
- break ;
- case kTextEncodingISOLatinArabic :
- enc = wxFONTENCODING_ISO8859_6;
- break ;
- case kTextEncodingISOLatinGreek :
- enc = wxFONTENCODING_ISO8859_7;
- break ;
- case kTextEncodingISOLatinHebrew :
- enc = wxFONTENCODING_ISO8859_8;
- break ;
- case kTextEncodingISOLatin5 :
- enc = wxFONTENCODING_ISO8859_9;
- break ;
- case kTextEncodingISOLatin6 :
- enc = wxFONTENCODING_ISO8859_10;
- break ;
- case kTextEncodingISOLatin7 :
- enc = wxFONTENCODING_ISO8859_13;
- break ;
- case kTextEncodingISOLatin8 :
- enc = wxFONTENCODING_ISO8859_14;
- break ;
- case kTextEncodingISOLatin9 :
- enc =wxFONTENCODING_ISO8859_15 ;
- break ;
-
- case kTextEncodingKOI8_R :
- enc = wxFONTENCODING_KOI8;
- break ;
-/*
- case :
- enc = wxFONTENCODING_BULGARIAN;
- break ;
-*/
- case kTextEncodingDOSLatinUS :
- enc = wxFONTENCODING_CP437;
- break ;
- case kTextEncodingDOSLatin1 :
- enc = wxFONTENCODING_CP850;
- break ;
- case kTextEncodingDOSLatin2 :
- enc =wxFONTENCODING_CP852 ;
- break ;
- case kTextEncodingDOSCyrillic :
- enc = wxFONTENCODING_CP855;
- break ;
- case kTextEncodingDOSRussian :
- enc = wxFONTENCODING_CP866;
- break ;
- case kTextEncodingDOSThai :
- enc =wxFONTENCODING_CP874 ;
- break ;
- case kTextEncodingDOSJapanese :
- enc = wxFONTENCODING_CP932;
- break ;
- case kTextEncodingDOSChineseSimplif :
- enc = wxFONTENCODING_CP936;
- break ;
- case kTextEncodingDOSKorean :
- enc = wxFONTENCODING_CP949;
- break ;
- case kTextEncodingDOSChineseTrad :
- enc = wxFONTENCODING_CP950;
- break ;
-
- case kTextEncodingWindowsLatin2 :
- enc = wxFONTENCODING_CP1250;
- break ;
- case kTextEncodingWindowsCyrillic :
- enc = wxFONTENCODING_CP1251;
- break ;
- case kTextEncodingWindowsLatin1 :
- enc = wxFONTENCODING_CP1252;
- break ;
- case kTextEncodingWindowsGreek :
- enc = wxFONTENCODING_CP1253;
- break ;
- case kTextEncodingWindowsLatin5 :
- enc = wxFONTENCODING_CP1254;
- break ;
- case kTextEncodingWindowsHebrew :
- enc = wxFONTENCODING_CP1255;
- break ;
- case kTextEncodingWindowsArabic :
- enc = wxFONTENCODING_CP1256;
- break ;
- case kTextEncodingWindowsBalticRim :
- enc =wxFONTENCODING_CP1257 ;
- break ;
- case kTextEncodingEUC_JP :
- enc = wxFONTENCODING_EUC_JP;
- break ;
- /*
- case wxFONTENCODING_UTF7 :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
- break ;
- case wxFONTENCODING_UTF8 :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
- break ;
- case wxFONTENCODING_UTF16BE :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
- break ;
- case wxFONTENCODING_UTF16LE :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
- break ;
- case wxFONTENCODING_UTF32BE :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
- break ;
- case wxFONTENCODING_UTF32LE :
- enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
- break ;
- */
- case kTextEncodingMacRoman :
- enc = wxFONTENCODING_MACROMAN ;
- break ;
- case kTextEncodingMacJapanese :
- enc = wxFONTENCODING_MACJAPANESE ;
- break ;
- case kTextEncodingMacChineseTrad :
- enc = wxFONTENCODING_MACCHINESETRAD ;
- break ;
- case kTextEncodingMacKorean :
- enc = wxFONTENCODING_MACKOREAN ;
- break ;
- case kTextEncodingMacArabic :
- enc =wxFONTENCODING_MACARABIC ;
- break ;
- case kTextEncodingMacHebrew :
- enc = wxFONTENCODING_MACHEBREW ;
- break ;
- case kTextEncodingMacGreek :
- enc = wxFONTENCODING_MACGREEK ;
- break ;
- case kTextEncodingMacCyrillic :
- enc = wxFONTENCODING_MACCYRILLIC ;
- break ;
- case kTextEncodingMacDevanagari :
- enc = wxFONTENCODING_MACDEVANAGARI ;
- break ;
- case kTextEncodingMacGurmukhi :
- enc = wxFONTENCODING_MACGURMUKHI ;
- break ;
- case kTextEncodingMacGujarati :
- enc = wxFONTENCODING_MACGUJARATI ;
- break ;
- case kTextEncodingMacOriya :
- enc =wxFONTENCODING_MACORIYA ;
- break ;
- case kTextEncodingMacBengali :
- enc =wxFONTENCODING_MACBENGALI ;
- break ;
- case kTextEncodingMacTamil :
- enc = wxFONTENCODING_MACTAMIL ;
- break ;
- case kTextEncodingMacTelugu :
- enc = wxFONTENCODING_MACTELUGU ;
- break ;
- case kTextEncodingMacKannada :
- enc = wxFONTENCODING_MACKANNADA ;
- break ;
- case kTextEncodingMacMalayalam :
- enc = wxFONTENCODING_MACMALAJALAM ;
- break ;
- case kTextEncodingMacSinhalese :
- enc = wxFONTENCODING_MACSINHALESE ;
- break ;
- case kTextEncodingMacBurmese :
- enc = wxFONTENCODING_MACBURMESE ;
- break ;
- case kTextEncodingMacKhmer :
- enc = wxFONTENCODING_MACKHMER ;
- break ;
- case kTextEncodingMacThai :
- enc = wxFONTENCODING_MACTHAI ;
- break ;
- case kTextEncodingMacLaotian :
- enc = wxFONTENCODING_MACLAOTIAN ;
- break ;
- case kTextEncodingMacGeorgian :
- enc = wxFONTENCODING_MACGEORGIAN ;
- break ;
- case kTextEncodingMacArmenian :
- enc = wxFONTENCODING_MACARMENIAN ;
- break ;
- case kTextEncodingMacChineseSimp :
- enc = wxFONTENCODING_MACCHINESESIMP ;
- break ;
- case kTextEncodingMacTibetan :
- enc = wxFONTENCODING_MACTIBETAN ;
- break ;
- case kTextEncodingMacMongolian :
- enc = wxFONTENCODING_MACMONGOLIAN ;
- break ;
- case kTextEncodingMacEthiopic :
- enc = wxFONTENCODING_MACETHIOPIC ;
- break ;
- case kTextEncodingMacCentralEurRoman:
- enc = wxFONTENCODING_MACCENTRALEUR ;
- break ;
- case kTextEncodingMacVietnamese:
- enc = wxFONTENCODING_MACVIATNAMESE ;
- break ;
- case kTextEncodingMacExtArabic :
- enc = wxFONTENCODING_MACARABICEXT ;
- break ;
- case kTextEncodingMacSymbol :
- enc = wxFONTENCODING_MACSYMBOL ;
- break ;
- case kTextEncodingMacDingbats :
- enc = wxFONTENCODING_MACDINGBATS ;
- break ;
- case kTextEncodingMacTurkish :
- enc = wxFONTENCODING_MACTURKISH ;
- break ;
- case kTextEncodingMacCroatian :
- enc = wxFONTENCODING_MACCROATIAN ;
- break ;
- case kTextEncodingMacIcelandic :
- enc = wxFONTENCODING_MACICELANDIC ;
- break ;
- case kTextEncodingMacRomanian :
- enc = wxFONTENCODING_MACROMANIAN ;
- break ;
- case kTextEncodingMacCeltic :
- enc = wxFONTENCODING_MACCELTIC ;
- break ;
- case kTextEncodingMacGaelic :
- enc = wxFONTENCODING_MACGAELIC ;
- break ;
- case kTextEncodingMacKeyboardGlyphs :
- enc = wxFONTENCODING_MACKEYBOARD ;
- break ;
- } ;
- return enc ;
+ return wxString( (char*) &from[1] , wxConvLocal , from[0] );
}
+// ----------------------------------------------------------------------------
+// Common Event Support
+// ----------------------------------------------------------------------------
-//
-// CFStringRefs (Carbon only)
-//
-
-#if TARGET_CARBON
+extern ProcessSerialNumber gAppProcess;
-// converts this string into a carbon foundation string with optional pc 2 mac encoding
-void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
+void wxMacWakeUp()
{
- Release() ;
+ ProcessSerialNumber psn;
+ Boolean isSame;
+ psn.highLongOfPSN = 0;
+ psn.lowLongOfPSN = kCurrentProcess;
+ SameProcess( &gAppProcess , &psn , &isSame );
+ if ( isSame )
+ {
+#if TARGET_CARBON
+ OSStatus err = noErr;
- wxString str = st ;
- wxMacConvertNewlines13To10( &str ) ;
-#if wxUSE_UNICODE
-#if SIZEOF_WCHAR_T == 2
- m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,
- (UniChar*)str.wc_str() , str.Len() );
-#else
- wxMBConvUTF16BE converter ;
- size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
- UniChar *unibuf = new UniChar[ unicharlen / sizeof(UniChar) + 1 ] ;
- converter.WC2MB( (char*)unibuf , str.wc_str() , unicharlen ) ;
- m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault ,
- unibuf , unicharlen / sizeof(UniChar) ) ;
- delete[] unibuf ;
-#endif
-#else // not wxUSE_UNICODE
- m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
- wxMacGetSystemEncFromFontEnc( encoding ) ) ;
-#endif
- m_release = true ;
-}
+#if 0
+ // lead sometimes to race conditions, although all calls used should be thread safe ...
+ static wxMacCarbonEvent s_wakeupEvent;
+ if ( !s_wakeupEvent.IsValid() )
+ {
+ err = s_wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),
+ kEventAttributeNone );
+ }
+ if ( err == noErr )
+ {
-wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
-{
- Size cflen = CFStringGetLength( m_cfs ) ;
- size_t noChars ;
- wxChar* buf = NULL ;
-
-#if wxUSE_UNICODE
-#if SIZEOF_WCHAR_T == 2
- buf = new wxChar[ cflen + 1 ] ;
- CFStringGetCharacters( m_cfs , CFRangeMake( 0 , cflen ) , (UniChar*) buf ) ;
- noChars = cflen ;
+ if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
+ return;
+ s_wakeupEvent.SetCurrentTime();
+ err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
+ kEventPriorityHigh );
+ }
#else
- UniChar* unibuf = new UniChar[ cflen + 1 ] ;
- CFStringGetCharacters( m_cfs , CFRangeMake( 0 , cflen ) , (UniChar*) unibuf ) ;
- unibuf[cflen] = 0 ;
- wxMBConvUTF16BE converter ;
- noChars = converter.MB2WC( NULL , (const char*)unibuf , 0 ) ;
- buf = new wxChar[ noChars + 1 ] ;
- converter.MB2WC( buf , (const char*)unibuf , noChars ) ;
- delete[] unibuf ;
+ wxMacCarbonEvent wakeupEvent;
+ wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),
+ kEventAttributeNone );
+ err = PostEventToQueue(GetMainEventQueue(), wakeupEvent,
+ kEventPriorityHigh );
#endif
#else
- CFIndex cStrLen ;
- CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
- '?' , false , NULL , 0 , &cStrLen ) ;
- buf = new wxChar[ cStrLen + 1 ] ;
- CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
- '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
- noChars = cStrLen ;
+ PostEvent( nullEvent , 0 );
#endif
-
- buf[noChars] = 0 ;
- wxMacConvertNewlines10To13( buf ) ;
- wxString result(buf) ;
- delete[] buf ;
- return result ;
-}
-
-#endif //TARGET_CARBON
-
-void wxMacConvertNewlines13To10( char * data )
-{
- char * buf = data ;
- while( (buf=strchr(buf,0x0d)) != NULL )
- {
- *buf = 0x0a ;
- buf++ ;
}
-}
-
-void wxMacConvertNewlines10To13( char * data )
-{
- char * buf = data ;
- while( (buf=strchr(buf,0x0a)) != NULL )
+ else
{
- *buf = 0x0d ;
- buf++ ;
+ WakeUpProcess( &gAppProcess );
}
}
-void wxMacConvertNewlines13To10( wxString * data )
-{
- size_t len = data->Length() ;
-
- if ( len == 0 || wxStrchr(data->c_str(),0x0d)==NULL)
- return ;
-
- wxString temp(*data) ;
- wxStringBuffer buf(*data,len ) ;
- memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
-
- wxMacConvertNewlines13To10( buf ) ;
-}
+#endif // wxUSE_BASE
-void wxMacConvertNewlines10To13( wxString * data )
-{
- size_t len = data->Length() ;
+#if wxUSE_GUI
- if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL)
- return ;
+// ----------------------------------------------------------------------------
+// Native Struct Conversions
+// ----------------------------------------------------------------------------
- wxString temp(*data) ;
- wxStringBuffer buf(*data,len ) ;
- memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
- wxMacConvertNewlines10To13( buf ) ;
+void wxMacRectToNative( const wxRect *wx , Rect *n )
+{
+ n->left = wx->x;
+ n->top = wx->y;
+ n->right = wx->x + wx->width;
+ n->bottom = wx->y + wx->height;
}
+void wxMacNativeToRect( const Rect *n , wxRect* wx )
+{
+ wx->x = n->left;
+ wx->y = n->top;
+ wx->width = n->right - n->left;
+ wx->height = n->bottom - n->top;
+}
-#if wxUSE_UNICODE
-void wxMacConvertNewlines13To10( wxChar * data )
-{
- wxChar * buf = data ;
- while( (buf=wxStrchr(buf,0x0d)) != NULL )
- {
- *buf = 0x0a ;
- buf++ ;
- }
+void wxMacPointToNative( const wxPoint* wx , Point *n )
+{
+ n->h = wx->x;
+ n->v = wx->y;
}
-void wxMacConvertNewlines10To13( wxChar * data )
-{
- wxChar * buf = data ;
- while( (buf=wxStrchr(buf,0x0a)) != NULL )
- {
- *buf = 0x0d ;
- buf++ ;
- }
+void wxMacNativeToPoint( const Point *n , wxPoint* wx )
+{
+ wx->x = n->h;
+ wx->y = n->v;
}
-#endif
// ----------------------------------------------------------------------------
-// Common Event Support
+// Carbon Event Support
// ----------------------------------------------------------------------------
+OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData)
+{
+ return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData );
+}
-extern ProcessSerialNumber gAppProcess ;
-
-void wxMacWakeUp()
+OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, const void * inData)
{
- ProcessSerialNumber psn ;
- Boolean isSame ;
- psn.highLongOfPSN = 0 ;
- psn.lowLongOfPSN = kCurrentProcess ;
- SameProcess( &gAppProcess , &psn , &isSame ) ;
- if ( isSame )
- {
-#if TARGET_CARBON
- EventRef dummyEvent ;
- OSStatus err = MacCreateEvent(nil, 'WXMC', 'WXMC', GetCurrentEventTime(),
- kEventAttributeNone, &dummyEvent);
- if (err == noErr)
- {
- err = PostEventToQueue(GetMainEventQueue(), dummyEvent,
- kEventPriorityHigh);
- }
-#else
- PostEvent( nullEvent , 0 ) ;
-#endif
- }
- else
- {
- WakeUpProcess( &gAppProcess ) ;
- }
+ return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData );
}
-#endif // wxUSE_BASE
+// ----------------------------------------------------------------------------
+// Control Access Support
+// ----------------------------------------------------------------------------
-#if wxUSE_GUI
+IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject )
+wxMacControl::wxMacControl()
+{
+ Init();
+}
-// ----------------------------------------------------------------------------
-// Carbon Event Support
-// ----------------------------------------------------------------------------
+wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl )
+{
+ Init();
+ m_peer = peer;
+ m_isRootControl = isRootControl;
+}
+wxMacControl::wxMacControl( wxWindow* peer , ControlRef control )
+{
+ Init();
+ m_peer = peer;
+ m_controlRef = control;
+}
-OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData)
+wxMacControl::wxMacControl( wxWindow* peer , WXWidget control )
{
- return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData ) ;
+ Init();
+ m_peer = peer;
+ m_controlRef = (ControlRef) control;
}
-OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, const void * inData)
+wxMacControl::~wxMacControl()
{
- return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData ) ;
}
-// ----------------------------------------------------------------------------
-// Control Access Support
-// ----------------------------------------------------------------------------
+void wxMacControl::Init()
+{
+ m_peer = NULL;
+ m_controlRef = NULL;
+ m_needsFocusRect = false;
+ m_isRootControl = false;
+}
void wxMacControl::Dispose()
{
- ::DisposeControl( m_controlRef ) ;
- m_controlRef = NULL ;
+ wxASSERT_MSG( m_controlRef != NULL , wxT("Control Handle already NULL, Dispose called twice ?") );
+ wxASSERT_MSG( IsValidControlHandle(m_controlRef) , wxT("Invalid Control Handle (maybe already released) in Dispose") );
+
+ // we cannot check the ref count here anymore, as autorelease objects might delete their refs later
+ // we can have situations when being embedded, where the control gets deleted behind our back, so only
+ // CFRelease if we are safe
+ if ( IsValidControlHandle(m_controlRef) )
+ CFRelease(m_controlRef);
+ m_controlRef = NULL;
}
-void wxMacControl::SetReference( SInt32 data )
+void wxMacControl::SetReference( URefCon data )
{
- SetControlReference( m_controlRef , data ) ;
+ SetControlReference( m_controlRef , data );
}
OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const
{
- return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;
+ return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize );
}
OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const
{
- return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ;
+ return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize );
}
OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData)
{
- return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData ) ;
+ return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData );
}
-OSStatus wxMacControl::SendEvent( EventRef event , OptionBits inOptions )
+OSStatus wxMacControl::SendEvent( EventRef event , OptionBits inOptions )
{
#if TARGET_API_MAC_OSX
- return SendEventToEventTargetWithOptions( event,
- HIObjectGetEventTarget( (HIObjectRef) m_controlRef ), inOptions );
+ return SendEventToEventTargetWithOptions( event,
+ HIObjectGetEventTarget( (HIObjectRef) m_controlRef ), inOptions );
#else
- #pragma unused(inOptions)
- return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) ) ;
+ #pragma unused(inOptions)
+ return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) );
#endif
}
-OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions )
+OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions )
{
- wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess ) ;
- event.SetParameter<HICommand>(kEventParamDirectObject,command) ;
- return SendEvent( event , inOptions ) ;
+ wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess );
+
+ event.SetParameter<HICommand>(kEventParamDirectObject,command);
+
+ return SendEvent( event , inOptions );
}
-OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions )
+OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions )
{
- HICommand command ;
- memset( &command, 0 , sizeof(command) ) ;
- command.commandID = commandID ;
- return SendHICommand( command , inOptions ) ;
+ HICommand command;
+
+ memset( &command, 0 , sizeof(command) );
+ command.commandID = commandID;
+ return SendHICommand( command , inOptions );
}
-void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
+void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
{
- HiliteControl( m_controlRef , part ) ;
- unsigned long finalTicks ;
- Delay( ticks , &finalTicks ) ;
- HiliteControl( m_controlRef , kControlNoPart ) ;
+ unsigned long finalTicks;
+
+ HiliteControl( m_controlRef , part );
+ Delay( ticks , &finalTicks );
+ HiliteControl( m_controlRef , kControlNoPart );
}
SInt32 wxMacControl::GetValue() const
-{
- return ::GetControl32BitValue( m_controlRef ) ;
+{
+ return ::GetControl32BitValue( m_controlRef );
}
SInt32 wxMacControl::GetMaximum() const
-{
- return ::GetControl32BitMaximum( m_controlRef ) ;
+{
+ return ::GetControl32BitMaximum( m_controlRef );
}
SInt32 wxMacControl::GetMinimum() const
-{
- return ::GetControl32BitMinimum( m_controlRef ) ;
+{
+ return ::GetControl32BitMinimum( m_controlRef );
}
-void wxMacControl::SetValue( SInt32 v )
-{
- ::SetControl32BitValue( m_controlRef , v ) ;
+void wxMacControl::SetValue( SInt32 v )
+{
+ ::SetControl32BitValue( m_controlRef , v );
}
-void wxMacControl::SetMinimum( SInt32 v )
-{
- ::SetControl32BitMinimum( m_controlRef , v ) ;
+void wxMacControl::SetMinimum( SInt32 v )
+{
+ ::SetControl32BitMinimum( m_controlRef , v );
}
-void wxMacControl::SetMaximum( SInt32 v )
-{
- ::SetControl32BitMaximum( m_controlRef , v ) ;
+void wxMacControl::SetMaximum( SInt32 v )
+{
+ ::SetControl32BitMaximum( m_controlRef , v );
}
void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum )
{
- ::SetControl32BitMinimum( m_controlRef , minimum ) ;
- ::SetControl32BitMaximum( m_controlRef , maximum ) ;
- ::SetControl32BitValue( m_controlRef , value ) ;
+ ::SetControl32BitMinimum( m_controlRef , minimum );
+ ::SetControl32BitMaximum( m_controlRef , maximum );
+ ::SetControl32BitValue( m_controlRef , value );
}
-OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart )
+OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart )
{
- return SetKeyboardFocus( GetControlOwner( m_controlRef ) ,
- m_controlRef , focusPart ) ;
+ return SetKeyboardFocus( GetControlOwner( m_controlRef ), m_controlRef, focusPart );
}
-bool wxMacControl::HasFocus() const
+bool wxMacControl::HasFocus() const
{
- ControlRef control ;
- GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
- return control == m_controlRef ;
+ ControlRef control;
+ GetKeyboardFocus( GetUserFocusWindow() , &control );
+ return control == m_controlRef;
}
-bool wxMacControl::NeedsFocusRect() const
+void wxMacControl::SetNeedsFocusRect( bool needs )
{
- return false ;
+ m_needsFocusRect = needs;
}
-void wxMacControl::VisibilityChanged(bool shown)
+bool wxMacControl::NeedsFocusRect() const
{
+ return m_needsFocusRect;
}
-void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
+void wxMacControl::VisibilityChanged(bool shown)
{
- m_font = font ;
- ControlFontStyleRec fontStyle;
- if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
- {
- switch( font.MacGetThemeFontID() )
- {
- case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ;
- case 109 /*mini font */ : fontStyle.font = -5 ; break ;
- case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ;
- default : fontStyle.font = kControlFontBigSystemFont ; break ;
- }
- fontStyle.flags = kControlUseFontMask ;
- }
- else
- {
- fontStyle.font = font.MacGetFontNum() ;
- fontStyle.style = font.MacGetFontStyle() ;
- fontStyle.size = font.MacGetFontSize() ;
- fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
- }
-
- fontStyle.just = teJustLeft ;
- fontStyle.flags |= kControlUseJustMask ;
- if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
- fontStyle.just = teJustCenter ;
- else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
- fontStyle.just = teJustRight ;
-
-
- // we only should do this in case of a non-standard color, as otherwise 'disabled' controls
- // won't get grayed out by the system anymore
-
- if ( foreground != *wxBLACK )
- {
- fontStyle.foreColor = MAC_WXCOLORREF(foreground.GetPixel() ) ;
- fontStyle.flags |= kControlUseForeColorMask ;
- }
-
- ::SetControlFontStyle( m_controlRef , &fontStyle );
}
-void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) )
+void wxMacControl::SuperChangedPosition()
{
- // TODO
- // setting up a color proc is not recommended anymore
}
-void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
+void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
{
- ::SetControl32BitMinimum( m_controlRef , minimum ) ;
- ::SetControl32BitMaximum( m_controlRef , maximum ) ;
-}
-
-short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers )
+ m_font = font;
+ ControlFontStyleRec fontStyle;
+ if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
+ {
+ switch ( font.MacGetThemeFontID() )
+ {
+ case kThemeSmallSystemFont :
+ fontStyle.font = kControlFontSmallSystemFont;
+ break;
+
+ case 109 : // mini font
+ fontStyle.font = -5;
+ break;
+
+ case kThemeSystemFont :
+ fontStyle.font = kControlFontBigSystemFont;
+ break;
+
+ default :
+ fontStyle.font = kControlFontBigSystemFont;
+ break;
+ }
+
+ fontStyle.flags = kControlUseFontMask;
+ }
+ else
+ {
+ fontStyle.font = font.MacGetFontNum();
+ fontStyle.style = font.MacGetFontStyle();
+ fontStyle.size = font.MacGetFontSize();
+ fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask;
+ }
+
+ fontStyle.just = teJustLeft;
+ fontStyle.flags |= kControlUseJustMask;
+ if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+ fontStyle.just = teJustCenter;
+ else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+ fontStyle.just = teJustRight;
+
+
+ // we only should do this in case of a non-standard color, as otherwise 'disabled' controls
+ // won't get grayed out by the system anymore
+
+ if ( foreground != *wxBLACK )
+ {
+ fontStyle.foreColor = MAC_WXCOLORREF( foreground.GetPixel() );
+ fontStyle.flags |= kControlUseForeColorMask;
+ }
+
+ ::SetControlFontStyle( m_controlRef , &fontStyle );
+}
+
+void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) )
+{
+ // TODO
+ // setting up a color proc is not recommended anymore
+}
+
+void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
+{
+ ::SetControl32BitMinimum( m_controlRef , minimum );
+ ::SetControl32BitMaximum( m_controlRef , maximum );
+}
+
+short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers )
{
- return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ) ;
+#ifndef __LP64__
+ return HandleControlKey( m_controlRef , keyCode , charCode , modifiers );
+#else
+ return 0;
+#endif
}
void wxMacControl::SetActionProc( ControlActionUPP actionProc )
{
- SetControlAction( m_controlRef , actionProc ) ;
+ SetControlAction( m_controlRef , actionProc );
}
void wxMacControl::SetViewSize( SInt32 viewSize )
{
- SetControlViewSize(m_controlRef , viewSize ) ;
+ SetControlViewSize(m_controlRef , viewSize );
}
SInt32 wxMacControl::GetViewSize() const
{
- return GetControlViewSize( m_controlRef ) ;
+ return GetControlViewSize( m_controlRef );
}
-bool wxMacControl::IsVisible() const
+bool wxMacControl::IsVisible() const
{
- return IsControlVisible( m_controlRef ) ;
+ return IsControlVisible( m_controlRef );
}
-void wxMacControl::SetVisibility( bool visible , bool redraw )
+void wxMacControl::SetVisibility( bool visible , bool redraw )
{
- SetControlVisibility( m_controlRef , visible , redraw ) ;
+ SetControlVisibility( m_controlRef , visible , redraw );
}
-bool wxMacControl::IsEnabled() const
+bool wxMacControl::IsEnabled() const
{
#if TARGET_API_MAC_OSX
- return IsControlEnabled( m_controlRef ) ;
+ return IsControlEnabled( m_controlRef );
#else
- return IsControlActive( m_controlRef ) ;
+ return IsControlActive( m_controlRef );
#endif
}
-bool wxMacControl::IsActive() const
+bool wxMacControl::IsActive() const
{
- return IsControlActive( m_controlRef ) ;
+ return IsControlActive( m_controlRef );
}
-void wxMacControl::Enable( bool enable )
+void wxMacControl::Enable( bool enable )
{
-#if TARGET_API_MAC_OSX
- if ( enable )
- EnableControl( m_controlRef ) ;
- else
- DisableControl( m_controlRef ) ;
-#else
if ( enable )
- ActivateControl( m_controlRef ) ;
+ EnableControl( m_controlRef );
else
- DeactivateControl( m_controlRef ) ;
-#endif
+ DisableControl( m_controlRef );
}
-void wxMacControl::SetDrawingEnabled( bool enable )
+void wxMacControl::SetDrawingEnabled( bool enable )
{
-#if TARGET_API_MAC_OSX
- HIViewSetDrawingEnabled( m_controlRef , enable ) ;
-#endif
+ HIViewSetDrawingEnabled( m_controlRef , enable );
}
-bool wxMacControl::GetNeedsDisplay() const
+bool wxMacControl::GetNeedsDisplay() const
{
-#if TARGET_API_MAC_OSX
- return HIViewGetNeedsDisplay( m_controlRef ) ;
-#else
- return false ;
-#endif
+ return HIViewGetNeedsDisplay( m_controlRef );
}
-void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where )
+void wxMacControl::SetNeedsDisplay( RgnHandle where )
{
-#if TARGET_API_MAC_OSX
+ if ( !IsVisible() )
+ return;
+
+ HIViewSetNeedsDisplayInRegion( m_controlRef , where , true );
+}
+
+void wxMacControl::SetNeedsDisplay( Rect* where )
+{
+ if ( !IsVisible() )
+ return;
+
if ( where != NULL )
- HIViewSetNeedsDisplayInRegion( m_controlRef , where , needsDisplay ) ;
+ {
+ RgnHandle update = NewRgn();
+ RectRgn( update , where );
+ HIViewSetNeedsDisplayInRegion( m_controlRef , update , true );
+ DisposeRgn( update );
+ }
else
- HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ;
-#endif
+ HIViewSetNeedsDisplay( m_controlRef , true );
}
-void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )
+void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )
{
-#if TARGET_API_MAC_OSX
- HIPoint hiPoint ;
- hiPoint.x = pt->x ;
- hiPoint.y = pt->y ;
- HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef ) ;
- pt->x = (int)hiPoint.x ;
- pt->y = (int)hiPoint.y ;
-#endif
+ HIPoint hiPoint;
+
+ hiPoint.x = pt->x;
+ hiPoint.y = pt->y;
+ HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef );
+ pt->x = (int)hiPoint.x;
+ pt->y = (int)hiPoint.y;
}
-void wxMacControl::SetRect( Rect *r )
+void wxMacControl::SetRect( Rect *r )
{
-#if TARGET_API_MAC_OSX
- HIRect hir = { r->left , r->top , r->right - r->left , r->bottom - r->top } ;
- HIViewSetFrame ( m_controlRef , &hir ) ;
-#else
- SetControlBounds( m_controlRef , r ) ;
-#endif
-
+ //A HIRect is actually a CGRect on OSX - which consists of two structures -
+ //CGPoint and CGSize, which have two floats each
+ HIRect hir = { { r->left , r->top }, { r->right - r->left , r->bottom - r->top } };
+ HIViewSetFrame ( m_controlRef , &hir );
+ // eventuall we might have to do a SetVisibility( false , true );
+ // before and a SetVisibility( true , true ); after
}
-void wxMacControl::GetRect( Rect *r )
+void wxMacControl::GetRect( Rect *r )
{
- GetControlBounds( m_controlRef , r ) ;
+ GetControlBounds( m_controlRef , r );
}
-void wxMacControl::GetRectInWindowCoords( Rect *r )
+void wxMacControl::GetRectInWindowCoords( Rect *r )
{
- UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ;
+ UMAGetControlBoundsInWindowCoords( m_controlRef , r );
}
-void wxMacControl::GetBestRect( Rect *r )
+void wxMacControl::GetBestRect( Rect *r )
{
- short baselineoffset ;
- GetBestControlRect( m_controlRef , r , &baselineoffset ) ;
+ short baselineoffset;
+
+ GetBestControlRect( m_controlRef , r , &baselineoffset );
}
-void wxMacControl::SetTitle( const wxString &title )
+void wxMacControl::SetLabel( const wxString &title )
{
- UMASetControlTitle( m_controlRef , title , m_font.GetEncoding() ) ;
+ wxFontEncoding encoding;
+
+ if ( m_font.Ok() )
+ encoding = m_font.GetEncoding();
+ else
+ encoding = wxFont::GetDefaultEncoding();
+
+ UMASetControlTitle( m_controlRef , title , encoding );
}
void wxMacControl::GetFeatures( UInt32 * features )
{
- GetControlFeatures( m_controlRef , features ) ;
+ GetControlFeatures( m_controlRef , features );
}
-OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )
+OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )
{
- return GetControlRegion( m_controlRef , partCode , region ) ;
+ OSStatus err = GetControlRegion( m_controlRef , partCode , region );
+ return err;
}
-OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )
+OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )
{
#if TARGET_API_MAC_OSX
- return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
- (other != NULL) ? other->m_controlRef : NULL) ;
+ return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
+ (other != NULL) ? other->m_controlRef : NULL);
#else
- return 0 ;
+ return 0;
#endif
}
-
#if TARGET_API_MAC_OSX
// SetNeedsDisplay would not invalidate the children
static void InvalidateControlAndChildren( HIViewRef control )
{
- HIViewSetNeedsDisplay( control , true ) ;
- UInt16 childrenCount = 0 ;
- OSStatus err = CountSubControls( control , &childrenCount ) ;
+ HIViewSetNeedsDisplay( control , true );
+ UInt16 childrenCount = 0;
+ OSStatus err = CountSubControls( control , &childrenCount );
if ( err == errControlIsNotEmbedder )
- return ;
- wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
+ return;
+
+ wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") );
- for ( UInt16 i = childrenCount ; i >=1 ; --i )
+ for ( UInt16 i = childrenCount; i >=1; --i )
{
- HIViewRef child ;
- err = GetIndexedSubControl( control , i , & child ) ;
+ HIViewRef child;
+
+ err = GetIndexedSubControl( control , i , & child );
if ( err == errControlIsNotEmbedder )
- return ;
- InvalidateControlAndChildren( child ) ;
+ return;
+
+ InvalidateControlAndChildren( child );
}
}
#endif
-void wxMacControl::InvalidateWithChildren()
+void wxMacControl::InvalidateWithChildren()
{
#if TARGET_API_MAC_OSX
- InvalidateControlAndChildren( m_controlRef ) ;
+ InvalidateControlAndChildren( m_controlRef );
#endif
}
-void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy )
+void wxMacControl::ScrollRect( wxRect *r , int dx , int dy )
{
-#if TARGET_API_MAC_OSX
- HIRect scrollarea = CGRectMake( r.x , r.y , r.width , r.height) ;
- HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ) ;
-#endif
+ wxASSERT( r != NULL );
+
+ HIRect scrollarea = CGRectMake( r->x , r->y , r->width , r->height);
+ HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy );
}
+OSType wxMacCreator = 'WXMC';
+OSType wxMacControlProperty = 'MCCT';
-// SetNeedsDisplay would not invalidate the children
+void wxMacControl::SetReferenceInNativeControl()
+{
+ void * data = this;
+ verify_noerr( SetControlProperty ( m_controlRef ,
+ wxMacCreator,wxMacControlProperty, sizeof(data), &data ) );
+}
+
+wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control)
+{
+ wxMacControl* ctl = NULL;
+ ByteCount actualSize;
+ if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) ,
+ &actualSize , &ctl ) == noErr )
+ {
+ return ctl;
+ }
+ return NULL;
+}
+// ============================================================================
+// DataBrowser Wrapper
+// ============================================================================
//
-// Databrowser
+// basing on DataBrowserItemIDs
//
-OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options )
+IMPLEMENT_ABSTRACT_CLASS( wxMacDataBrowserControl , wxMacControl )
+
+pascal void wxMacDataBrowserControl::DataBrowserItemNotificationProc(
+ ControlRef browser,
+ DataBrowserItemID itemID,
+ DataBrowserItemNotification message,
+ DataBrowserItemDataRef itemData )
+{
+ wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
+ if ( ctl != 0 )
+ {
+ ctl->ItemNotification(itemID, message, itemData);
+ }
+}
+
+pascal OSStatus wxMacDataBrowserControl::DataBrowserGetSetItemDataProc(
+ ControlRef browser,
+ DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData,
+ Boolean changeValue )
+{
+ OSStatus err = errDataBrowserPropertyNotSupported;
+ wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
+ if ( ctl != 0 )
+ {
+ err = ctl->GetSetItemData(itemID, property, itemData, changeValue);
+ }
+ return err;
+}
+
+pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc(
+ ControlRef browser,
+ DataBrowserItemID itemOneID,
+ DataBrowserItemID itemTwoID,
+ DataBrowserPropertyID sortProperty)
+{
+ wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
+ if ( ctl != 0 )
+ {
+ return ctl->CompareItems(itemOneID, itemTwoID, sortProperty);
+ }
+ return false;
+}
+
+DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL;
+DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL;
+DataBrowserItemCompareUPP gDataBrowserItemCompareUPP = NULL;
+
+wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style) : wxMacControl( peer )
+{
+ Rect bounds = wxMacGetBoundsForControl( peer, pos, size );
+ OSStatus err = ::CreateDataBrowserControl(
+ MAC_WXHWND(peer->MacGetTopLevelWindowRef()),
+ &bounds, kDataBrowserListView, &m_controlRef );
+ SetReferenceInNativeControl();
+ verify_noerr( err );
+ if ( gDataBrowserItemCompareUPP == NULL )
+ gDataBrowserItemCompareUPP = NewDataBrowserItemCompareUPP(DataBrowserCompareProc);
+ if ( gDataBrowserItemDataUPP == NULL )
+ gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(DataBrowserGetSetItemDataProc);
+ if ( gDataBrowserItemNotificationUPP == NULL )
+ {
+ gDataBrowserItemNotificationUPP =
+#if TARGET_API_MAC_OSX
+ (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc);
+#else
+ NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc);
+#endif
+ }
+
+ DataBrowserCallbacks callbacks;
+ InitializeDataBrowserCallbacks( &callbacks, kDataBrowserLatestCallbacks );
+
+ callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
+ callbacks.u.v1.itemCompareCallback = gDataBrowserItemCompareUPP;
+ callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
+ SetCallbacks( &callbacks );
+
+}
+
+OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container,
+ Boolean recurse,
+ DataBrowserItemState state,
+ ItemCount *numItems) const
+{
+ return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems );
+}
+
+OSStatus wxMacDataBrowserControl::GetItems( DataBrowserItemID container,
+ Boolean recurse,
+ DataBrowserItemState state,
+ Handle items) const
+{
+ return GetDataBrowserItems( m_controlRef, container, recurse, state, items );
+}
+
+OSStatus wxMacDataBrowserControl::SetSelectionFlags( DataBrowserSelectionFlags options )
+{
+ return SetDataBrowserSelectionFlags( m_controlRef, options );
+}
+
+OSStatus wxMacDataBrowserControl::AddColumn( DataBrowserListViewColumnDesc *columnDesc,
+ DataBrowserTableViewColumnIndex position )
+{
+ return AddDataBrowserListViewColumn( m_controlRef, columnDesc, position );
+}
+
+OSStatus wxMacDataBrowserControl::GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id ){
+ return GetDataBrowserTableViewColumnProperty( m_controlRef, position, id );
+}
+
+OSStatus wxMacDataBrowserControl::RemoveColumn( DataBrowserTableViewColumnIndex position )
+{
+ DataBrowserTableViewColumnID id;
+ GetColumnIDFromIndex( position, &id );
+ return RemoveDataBrowserTableViewColumn( m_controlRef, id );
+}
+
+OSStatus wxMacDataBrowserControl::AutoSizeColumns()
+{
+ return AutoSizeDataBrowserListViewColumns(m_controlRef);
+}
+
+OSStatus wxMacDataBrowserControl::SetHasScrollBars( bool horiz, bool vert )
+{
+ return SetDataBrowserHasScrollBars( m_controlRef, horiz, vert );
+}
+
+OSStatus wxMacDataBrowserControl::SetHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
+{
+ return SetDataBrowserTableViewHiliteStyle( m_controlRef, hiliteStyle );
+}
+
+OSStatus wxMacDataBrowserControl::SetHeaderButtonHeight(UInt16 height)
+{
+ return SetDataBrowserListViewHeaderBtnHeight( m_controlRef, height );
+}
+
+OSStatus wxMacDataBrowserControl::GetHeaderButtonHeight(UInt16 *height)
+{
+ return GetDataBrowserListViewHeaderBtnHeight( m_controlRef, height );
+}
+
+OSStatus wxMacDataBrowserControl::SetCallbacks(const DataBrowserCallbacks *callbacks)
+{
+ return SetDataBrowserCallbacks( m_controlRef, callbacks );
+}
+
+OSStatus wxMacDataBrowserControl::UpdateItems(
+ DataBrowserItemID container,
+ UInt32 numItems,
+ const DataBrowserItemID *items,
+ DataBrowserPropertyID preSortProperty,
+ DataBrowserPropertyID propertyID ) const
+{
+ return UpdateDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty, propertyID );
+}
+
+bool wxMacDataBrowserControl::IsItemSelected( DataBrowserItemID item ) const
+{
+ return IsDataBrowserItemSelected( m_controlRef, item );
+}
+
+OSStatus wxMacDataBrowserControl::AddItems(
+ DataBrowserItemID container,
+ UInt32 numItems,
+ const DataBrowserItemID *items,
+ DataBrowserPropertyID preSortProperty )
+{
+ return AddDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty );
+}
+
+OSStatus wxMacDataBrowserControl::RemoveItems(
+ DataBrowserItemID container,
+ UInt32 numItems,
+ const DataBrowserItemID *items,
+ DataBrowserPropertyID preSortProperty )
+{
+ return RemoveDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty );
+}
+
+OSStatus wxMacDataBrowserControl::RevealItem(
+ DataBrowserItemID item,
+ DataBrowserPropertyID propertyID,
+ DataBrowserRevealOptions options ) const
+{
+ return RevealDataBrowserItem( m_controlRef, item, propertyID, options );
+}
+
+OSStatus wxMacDataBrowserControl::SetSelectedItems(
+ UInt32 numItems,
+ const DataBrowserItemID *items,
+ DataBrowserSetOption operation )
+{
+ return SetDataBrowserSelectedItems( m_controlRef, numItems, items, operation );
+}
+
+OSStatus wxMacDataBrowserControl::GetSelectionAnchor( DataBrowserItemID *first, DataBrowserItemID *last ) const
+{
+ return GetDataBrowserSelectionAnchor( m_controlRef, first, last );
+}
+
+OSStatus wxMacDataBrowserControl::GetItemID( DataBrowserTableViewRowIndex row, DataBrowserItemID * item ) const
+{
+ return GetDataBrowserTableViewItemID( m_controlRef, row, item );
+}
+
+OSStatus wxMacDataBrowserControl::GetItemRow( DataBrowserItemID item, DataBrowserTableViewRowIndex * row ) const
+{
+ return GetDataBrowserTableViewItemRow( m_controlRef, item, row );
+}
+
+OSStatus wxMacDataBrowserControl::SetDefaultRowHeight( UInt16 height )
+{
+ return SetDataBrowserTableViewRowHeight( m_controlRef , height );
+}
+
+OSStatus wxMacDataBrowserControl::GetDefaultRowHeight( UInt16 * height ) const
+{
+ return GetDataBrowserTableViewRowHeight( m_controlRef, height );
+}
+
+OSStatus wxMacDataBrowserControl::SetRowHeight( DataBrowserItemID item , UInt16 height)
+{
+ return SetDataBrowserTableViewItemRowHeight( m_controlRef, item , height );
+}
+
+OSStatus wxMacDataBrowserControl::GetRowHeight( DataBrowserItemID item , UInt16 *height) const
+{
+ return GetDataBrowserTableViewItemRowHeight( m_controlRef, item , height);
+}
+
+OSStatus wxMacDataBrowserControl::GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const
+{
+ return GetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width );
+}
+
+OSStatus wxMacDataBrowserControl::SetColumnWidth( DataBrowserPropertyID column , UInt16 width )
+{
+ return SetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width );
+}
+
+OSStatus wxMacDataBrowserControl::GetDefaultColumnWidth( UInt16 *width ) const
+{
+ return GetDataBrowserTableViewColumnWidth( m_controlRef , width );
+}
+
+OSStatus wxMacDataBrowserControl::SetDefaultColumnWidth( UInt16 width )
+{
+ return SetDataBrowserTableViewColumnWidth( m_controlRef , width );
+}
+
+OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const
+{
+ return GetDataBrowserTableViewColumnCount( m_controlRef, numColumns);
+}
+
+OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column,
+ DataBrowserTableViewColumnIndex *position) const
{
- return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
+ return GetDataBrowserTableViewColumnPosition( m_controlRef , column , position);
}
-OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
- DataBrowserTableViewColumnIndex position )
+OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position)
{
- return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
+ return SetDataBrowserTableViewColumnPosition( m_controlRef , column , position);
}
-OSStatus wxMacControl::AutoSizeListViewColumns()
+OSStatus wxMacDataBrowserControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const
{
- return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
+ return GetDataBrowserScrollPosition( m_controlRef , top , left );
}
-OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert )
+OSStatus wxMacDataBrowserControl::SetScrollPosition( UInt32 top , UInt32 left )
{
- return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
+ return SetDataBrowserScrollPosition( m_controlRef , top , left );
}
-OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
+OSStatus wxMacDataBrowserControl::GetSortProperty( DataBrowserPropertyID *column ) const
{
- return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
+ return GetDataBrowserSortProperty( m_controlRef , column );
}
-OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height)
+OSStatus wxMacDataBrowserControl::SetSortProperty( DataBrowserPropertyID column )
{
- return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height ) ;
+ return SetDataBrowserSortProperty( m_controlRef , column );
}
-OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks * callbacks)
+OSStatus wxMacDataBrowserControl::GetSortOrder( DataBrowserSortOrder *order ) const
{
- return SetDataBrowserCallbacks( m_controlRef , callbacks ) ;
+ return GetDataBrowserSortOrder( m_controlRef , order );
}
-OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty,
- DataBrowserPropertyID propertyID )
+OSStatus wxMacDataBrowserControl::SetSortOrder( DataBrowserSortOrder order )
{
- return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID ) ;
+ return SetDataBrowserSortOrder( m_controlRef , order );
}
-bool wxMacControl::IsItemSelected( DataBrowserItemID item )
+OSStatus wxMacDataBrowserControl::GetPropertyFlags( DataBrowserPropertyID property,
+ DataBrowserPropertyFlags *flags ) const
{
- return IsDataBrowserItemSelected( m_controlRef , item ) ;
+ return GetDataBrowserPropertyFlags( m_controlRef , property , flags );
}
-OSStatus wxMacControl::AddItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty )
+OSStatus wxMacDataBrowserControl::SetPropertyFlags( DataBrowserPropertyID property,
+ DataBrowserPropertyFlags flags )
{
- return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
+ return SetDataBrowserPropertyFlags( m_controlRef , property , flags );
}
-OSStatus wxMacControl::RemoveItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty )
+OSStatus wxMacDataBrowserControl::GetHeaderDesc( DataBrowserPropertyID property,
+ DataBrowserListViewHeaderDesc *desc ) const
{
- return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
+ return GetDataBrowserListViewHeaderDesc( m_controlRef , property , desc );
}
-OSStatus wxMacControl::RevealItem( DataBrowserItemID item,
- DataBrowserPropertyID propertyID,
- DataBrowserRevealOptions options )
+OSStatus wxMacDataBrowserControl::SetHeaderDesc( DataBrowserPropertyID property,
+ DataBrowserListViewHeaderDesc *desc )
{
- return RevealDataBrowserItem( m_controlRef , item , propertyID , options ) ;
+ return SetDataBrowserListViewHeaderDesc( m_controlRef , property , desc );
}
-OSStatus wxMacControl::SetSelectedItems(UInt32 numItems,
- const DataBrowserItemID * items,
- DataBrowserSetOption operation )
+OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID property ,
+ Boolean expandableRows )
{
- return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation ) ;
+ return SetDataBrowserListViewDisclosureColumn( m_controlRef, property, expandableRows);
}
+// ============================================================================
+// Higher-level Databrowser
+// ============================================================================
//
-// Tab Control
+// basing on data item objects
//
-
-OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
+
+wxMacDataItem::wxMacDataItem()
{
- return ::SetTabEnabled( m_controlRef , tabNo , enable ) ;
+ m_data = NULL;
+
+ m_order = 0;
+ m_colId = kTextColumnId; // for compat with existing wx*ListBox impls.
+}
+
+wxMacDataItem::~wxMacDataItem()
+{
+}
+
+void wxMacDataItem::SetOrder( SInt32 order )
+{
+ m_order = order;
+}
+
+SInt32 wxMacDataItem::GetOrder() const
+{
+ return m_order;
+}
+
+void wxMacDataItem::SetData( void* data)
+{
+ m_data = data;
+}
+
+void* wxMacDataItem::GetData() const
+{
+ return m_data;
+}
+
+short wxMacDataItem::GetColumn()
+{
+ return m_colId;
}
-
-#endif // wxUSE_GUI
+void wxMacDataItem::SetColumn( short col )
+{
+ m_colId = col;
+}
+
+void wxMacDataItem::SetLabel( const wxString& str)
+{
+ m_label = str;
+ m_cfLabel.Assign( str , wxLocale::GetSystemEncoding());
+}
+
+const wxString& wxMacDataItem::GetLabel() const
+{
+ return m_label;
+}
+
+bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner ,
+ const wxMacDataItem* rhs,
+ DataBrowserPropertyID sortProperty) const
+{
+ const wxMacDataItem* otherItem = wx_const_cast(wxMacDataItem*,rhs);
+ bool retval = false;
+
+ if ( sortProperty == m_colId ){
+ retval = m_label.CmpNoCase( otherItem->m_label) < 0;
+ }
+
+ else if ( sortProperty == kNumericOrderColumnId )
+ retval = m_order < otherItem->m_order;
+
+ return retval;
+}
+
+OSStatus wxMacDataItem::GetSetData( wxMacDataItemBrowserControl *owner ,
+ DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData,
+ bool changeValue )
+{
+ OSStatus err = errDataBrowserPropertyNotSupported;
+ if ( !changeValue )
+ {
+ if ( property == m_colId ){
+ err = ::SetDataBrowserItemDataText( itemData, m_cfLabel );
+ err = noErr;
+ }
+ else if ( property == kNumericOrderColumnId ){
+ err = ::SetDataBrowserItemDataValue( itemData, m_order );
+ err = noErr;
+ }
+ else{
+ }
+ }
+ else
+ {
+ switch (property)
+ {
+ // no editable props here
+ default:
+ break;
+ }
+ }
+
+ return err;
+}
+
+void wxMacDataItem::Notification(wxMacDataItemBrowserControl *owner ,
+ DataBrowserItemNotification message,
+ DataBrowserItemDataRef itemData ) const
+{
+}
+
+IMPLEMENT_DYNAMIC_CLASS( wxMacDataItemBrowserControl , wxMacDataBrowserControl )
+
+wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) :
+ wxMacDataBrowserControl( peer, pos, size, style )
+{
+ m_suppressSelection = false;
+ m_sortOrder = SortOrder_None;
+ m_clientDataItemsType = wxClientData_None;
+}
+
+wxMacDataItem* wxMacDataItemBrowserControl::CreateItem()
+{
+ return new wxMacDataItem();
+}
+
+wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser)
+{
+ m_former = browser->SuppressSelection(true);
+ m_browser = browser;
+}
+
+wxMacDataItemBrowserSelectionSuppressor::~wxMacDataItemBrowserSelectionSuppressor()
+{
+ m_browser->SuppressSelection(m_former);
+}
+
+bool wxMacDataItemBrowserControl::SuppressSelection( bool suppress )
+{
+ bool former = m_suppressSelection;
+ m_suppressSelection = suppress;
+
+ return former;
+}
+
+Boolean wxMacDataItemBrowserControl::CompareItems(DataBrowserItemID itemOneID,
+ DataBrowserItemID itemTwoID,
+ DataBrowserPropertyID sortProperty)
+{
+ wxMacDataItem* itemOne = (wxMacDataItem*) itemOneID;
+ wxMacDataItem* itemTwo = (wxMacDataItem*) itemTwoID;
+ return CompareItems( itemOne , itemTwo , sortProperty );
+}
+
+Boolean wxMacDataItemBrowserControl::CompareItems(const wxMacDataItem* itemOne,
+ const wxMacDataItem* itemTwo,
+ DataBrowserPropertyID sortProperty)
+{
+ Boolean retval = false;
+ if ( itemOne != NULL )
+ retval = itemOne->IsLessThan( this , itemTwo , sortProperty);
+ return retval;
+}
+
+OSStatus wxMacDataItemBrowserControl::GetSetItemData(
+ DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData,
+ Boolean changeValue )
+{
+ wxMacDataItem* item = (wxMacDataItem*) itemID;
+ return GetSetItemData(item, property, itemData , changeValue );
+}
+
+OSStatus wxMacDataItemBrowserControl::GetSetItemData(
+ wxMacDataItem* item,
+ DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData,
+ Boolean changeValue )
+{
+ OSStatus err = errDataBrowserPropertyNotSupported;
+ switch( property )
+ {
+ case kDataBrowserContainerIsClosableProperty :
+ case kDataBrowserContainerIsSortableProperty :
+ case kDataBrowserContainerIsOpenableProperty :
+ // right now default behaviour on these
+ break;
+ default :
+
+ if ( item != NULL ){
+ err = item->GetSetData( this, property , itemData , changeValue );
+ }
+ break;
+
+ }
+ return err;
+}
+
+void wxMacDataItemBrowserControl::ItemNotification(
+ DataBrowserItemID itemID,
+ DataBrowserItemNotification message,
+ DataBrowserItemDataRef itemData)
+{
+ wxMacDataItem* item = (wxMacDataItem*) itemID;
+ ItemNotification( item , message, itemData);
+}
+
+void wxMacDataItemBrowserControl::ItemNotification(
+ const wxMacDataItem* item,
+ DataBrowserItemNotification message,
+ DataBrowserItemDataRef itemData)
+{
+ if (item != NULL)
+ item->Notification( this, message, itemData);
+}
+
+unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container,
+ bool recurse , DataBrowserItemState state) const
+{
+ ItemCount numItems = 0;
+ verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container,
+ recurse, state, &numItems ) );
+ return numItems;
+}
+
+unsigned int wxMacDataItemBrowserControl::GetSelectedItemCount( const wxMacDataItem* container,
+ bool recurse ) const
+{
+ return GetItemCount( container, recurse, kDataBrowserItemIsSelected );
+
+}
+
+void wxMacDataItemBrowserControl::GetItems(const wxMacDataItem* container,
+ bool recurse , DataBrowserItemState state, wxArrayMacDataItemPtr &items) const
+{
+ Handle handle = NewHandle(0);
+ verify_noerr( wxMacDataBrowserControl::GetItems( (DataBrowserItemID)container ,
+ recurse , state, handle) );
+
+ int itemCount = GetHandleSize(handle)/sizeof(DataBrowserItemID);
+ HLock( handle );
+ wxMacDataItemPtr* itemsArray = (wxMacDataItemPtr*) *handle;
+ for ( int i = 0; i < itemCount; ++i)
+ {
+ items.Add(itemsArray[i]);
+ }
+ HUnlock( handle );
+ DisposeHandle( handle );
+}
+
+unsigned int wxMacDataItemBrowserControl::GetLineFromItem(const wxMacDataItem* item) const
+{
+ DataBrowserTableViewRowIndex row;
+ OSStatus err = GetItemRow( (DataBrowserItemID) item , &row);
+ wxASSERT( err == noErr);
+ return row;
+}
+
+wxMacDataItem* wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) const
+{
+ DataBrowserItemID id;
+ OSStatus err = GetItemID( (DataBrowserTableViewRowIndex) n , &id);
+ wxASSERT( err == noErr);
+ return (wxMacDataItem*) id;
+}
+
+void wxMacDataItemBrowserControl::UpdateItem(const wxMacDataItem *container,
+ const wxMacDataItem *item , DataBrowserPropertyID property) const
+{
+ verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, 1,
+ (DataBrowserItemID*) &item, kDataBrowserItemNoProperty /* notSorted */, property ) );
+}
+
+void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container,
+ wxArrayMacDataItemPtr &itemArray , DataBrowserPropertyID property) const
+{
+ unsigned int noItems = itemArray.GetCount();
+ DataBrowserItemID *items = new DataBrowserItemID[noItems];
+ for ( unsigned int i = 0; i < noItems; ++i )
+ items[i] = (DataBrowserItemID) itemArray[i];
+
+ verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, noItems,
+ items, kDataBrowserItemNoProperty /* notSorted */, property ) );
+ delete [] items;
+}
+
+void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType,
+ const wxString& title, SInt16 just, int defaultWidth)
+{
+ DataBrowserListViewColumnDesc columnDesc;
+ columnDesc.headerBtnDesc.titleOffset = 0;
+ columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+
+ columnDesc.headerBtnDesc.btnFontStyle.flags =
+ kControlUseFontMask | kControlUseJustMask;
+
+ columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlContentTextOnly;
+ columnDesc.headerBtnDesc.btnFontStyle.just = just;
+ columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+ columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+
+ // TODO: Why is m_font not defined when we enter wxLC_LIST mode, but is
+ // defined for other modes?
+ wxFontEncoding enc;
+ if ( m_font.Ok() )
+ enc = m_font.GetEncoding();
+ else
+ enc = wxLocale::GetSystemEncoding();
+ wxMacCFStringHolder cfTitle;
+ cfTitle.Assign( title, enc );
+ columnDesc.headerBtnDesc.titleString = cfTitle;
+
+ columnDesc.headerBtnDesc.minimumWidth = 0;
+ columnDesc.headerBtnDesc.maximumWidth = 30000;
+
+ columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
+ columnDesc.propertyDesc.propertyType = colType;
+ columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn;
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
+#endif
+
+ verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+
+ if (defaultWidth > 0){
+ SetColumnWidth(colId, defaultWidth);
+ }
+
+}
+
+void wxMacDataItemBrowserControl::SetColumnWidth(int colId, int width)
+{
+ DataBrowserPropertyID id;
+ GetColumnIDFromIndex(colId, &id);
+ verify_noerr( wxMacDataBrowserControl::SetColumnWidth(id, width));
+}
+
+int wxMacDataItemBrowserControl::GetColumnWidth(int colId)
+{
+ DataBrowserPropertyID id;
+ GetColumnIDFromIndex(colId, &id);
+ UInt16 result;
+ verify_noerr( wxMacDataBrowserControl::GetColumnWidth(id, &result));
+ return result;
+}
+
+void wxMacDataItemBrowserControl::AddItem(wxMacDataItem *container, wxMacDataItem *item)
+{
+ verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, 1,
+ (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ) );
+}
+
+void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray )
+{
+ unsigned int noItems = itemArray.GetCount();
+ DataBrowserItemID *items = new DataBrowserItemID[noItems];
+ for ( unsigned int i = 0; i < noItems; ++i )
+ items[i] = (DataBrowserItemID) itemArray[i];
+
+ verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, noItems,
+ (DataBrowserItemID*) items, kDataBrowserItemNoProperty ) );
+ delete [] items;
+}
+
+void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item)
+{
+ OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1,
+ (DataBrowserItemID*) &item, kDataBrowserItemNoProperty );
+ verify_noerr( err );
+}
+
+void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray)
+{
+ unsigned int noItems = itemArray.GetCount();
+ DataBrowserItemID *items = new DataBrowserItemID[noItems];
+ for ( unsigned int i = 0; i < noItems; ++i )
+ items[i] = (DataBrowserItemID) itemArray[i];
+
+ OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems,
+ (DataBrowserItemID*) items, kDataBrowserItemNoProperty );
+ verify_noerr( err );
+ delete [] items;
+}
+
+void wxMacDataItemBrowserControl::RemoveAllItems(wxMacDataItem *container)
+{
+ OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 0 , NULL , kDataBrowserItemNoProperty );
+ verify_noerr( err );
+}
+
+void wxMacDataItemBrowserControl::SetSelectedItem(wxMacDataItem* item , DataBrowserSetOption option)
+{
+ verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 1, (DataBrowserItemID*) &item, option ));
+}
+
+void wxMacDataItemBrowserControl::SetSelectedAllItems(DataBrowserSetOption option)
+{
+ verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 0 , NULL , option ));
+}
+
+void wxMacDataItemBrowserControl::SetSelectedItems(wxArrayMacDataItemPtr &itemArray , DataBrowserSetOption option)
+{
+ unsigned int noItems = itemArray.GetCount();
+ DataBrowserItemID *items = new DataBrowserItemID[noItems];
+ for ( unsigned int i = 0; i < noItems; ++i )
+ items[i] = (DataBrowserItemID) itemArray[i];
+
+ verify_noerr(wxMacDataBrowserControl::SetSelectedItems( noItems, (DataBrowserItemID*) items, option ));
+ delete [] items;
+}
+
+Boolean wxMacDataItemBrowserControl::IsItemSelected( const wxMacDataItem* item) const
+{
+ return wxMacDataBrowserControl::IsItemSelected( (DataBrowserItemID) item);
+}
+
+void wxMacDataItemBrowserControl::RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options)
+{
+ verify_noerr(wxMacDataBrowserControl::RevealItem( (DataBrowserItemID) item, kDataBrowserNoItem , options ) );
+}
+
+void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const
+{
+ verify_noerr(wxMacDataBrowserControl::GetSelectionAnchor( (DataBrowserItemID*) first, (DataBrowserItemID*) last) );
+}
+
+wxClientDataType wxMacDataItemBrowserControl::GetClientDataType() const
+{
+ return m_clientDataItemsType;
+}
+void wxMacDataItemBrowserControl::SetClientDataType(wxClientDataType clientDataItemsType)
+{
+ m_clientDataItemsType = clientDataItemsType;
+}
+
+unsigned int wxMacDataItemBrowserControl::MacGetCount() const
+{
+ return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState);
+}
+
+void wxMacDataItemBrowserControl::MacDelete( unsigned int n )
+{
+ wxMacDataItem* item = (wxMacDataItem*)GetItemFromLine( n );
+ RemoveItem( wxMacDataBrowserRootContainer, item );
+}
+
+void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxString& text, int column )
+{
+ wxMacDataItem* newItem = CreateItem();
+ newItem->SetLabel( text );
+ if ( column != -1 )
+ newItem->SetColumn( kMinColumnId + column );
+
+ if ( m_sortOrder == SortOrder_None )
+ {
+ // increase the order of the lines to be shifted
+ unsigned int lines = MacGetCount();
+ for ( unsigned int i = n; i < lines; ++i)
+ {
+ wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
+ iter->SetOrder( iter->GetOrder() + 1 );
+ }
+
+ SInt32 frontLineOrder = 0;
+ if ( n > 0 )
+ {
+ wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
+ frontLineOrder = iter->GetOrder();
+ }
+ newItem->SetOrder( frontLineOrder + 1 );
+ }
+
+ AddItem( wxMacDataBrowserRootContainer, newItem );
+}
+
+void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxArrayString& items, int column )
+{
+ size_t itemsCount = items.GetCount();
+ if ( itemsCount == 0 )
+ return;
+
+ SInt32 frontLineOrder = 0;
+
+ if ( m_sortOrder == SortOrder_None )
+ {
+ // increase the order of the lines to be shifted
+ unsigned int lines = MacGetCount();
+ for ( unsigned int i = n; i < lines; ++i)
+ {
+ wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
+ iter->SetOrder( iter->GetOrder() + itemsCount );
+ }
+ if ( n > 0 )
+ {
+ wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
+ frontLineOrder = iter->GetOrder();
+ }
+ }
+
+ wxArrayMacDataItemPtr ids;
+ ids.SetCount( itemsCount );
+
+ for ( unsigned int i = 0; i < itemsCount; ++i )
+ {
+ wxMacDataItem* item = CreateItem();
+ item->SetLabel( items[i]);
+ if ( column != -1 )
+ item->SetColumn( kMinColumnId + column );
+
+ if ( m_sortOrder == SortOrder_None )
+ item->SetOrder( frontLineOrder + 1 + i );
+
+ ids[i] = item;
+ }
+
+ AddItems( wxMacDataBrowserRootContainer, ids );
+}
+
+int wxMacDataItemBrowserControl::MacAppend( const wxString& text)
+{
+ wxMacDataItem* item = CreateItem();
+ item->SetLabel( text );
+ if ( m_sortOrder == SortOrder_None )
+ {
+ unsigned int lines = MacGetCount();
+ if ( lines == 0 )
+ item->SetOrder( 1 );
+ else
+ {
+ wxMacDataItem* frontItem = (wxMacDataItem*) GetItemFromLine(lines-1);
+ item->SetOrder( frontItem->GetOrder() + 1 );
+ }
+ }
+ AddItem( wxMacDataBrowserRootContainer, item );
+
+ return GetLineFromItem(item);
+}
+
+void wxMacDataItemBrowserControl::MacClear()
+{
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+ RemoveAllItems(wxMacDataBrowserRootContainer);
+}
+
+void wxMacDataItemBrowserControl::MacDeselectAll()
+{
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+ SetSelectedAllItems( kDataBrowserItemsRemove );
+}
+
+void wxMacDataItemBrowserControl::MacSetSelection( unsigned int n, bool select, bool multi )
+{
+ wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n);
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+
+ if ( IsItemSelected( item ) != select )
+ {
+ if ( select )
+ SetSelectedItem( item, multi ? kDataBrowserItemsAdd : kDataBrowserItemsAssign );
+ else
+ SetSelectedItem( item, kDataBrowserItemsRemove );
+ }
+
+ MacScrollTo( n );
+}
+
+bool wxMacDataItemBrowserControl::MacIsSelected( unsigned int n ) const
+{
+ wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n);
+ return IsItemSelected( item );
+}
+
+int wxMacDataItemBrowserControl::MacGetSelection() const
+{
+ wxMacDataItemPtr first, last;
+ GetSelectionAnchor( &first, &last );
+
+ if ( first != NULL )
+ {
+ return GetLineFromItem( first );
+ }
+
+ return -1;
+}
+
+int wxMacDataItemBrowserControl::MacGetSelections( wxArrayInt& aSelections ) const
+{
+ aSelections.Empty();
+ wxArrayMacDataItemPtr selectedItems;
+ GetItems( wxMacDataBrowserRootContainer, false , kDataBrowserItemIsSelected, selectedItems);
+
+ int count = selectedItems.GetCount();
+
+ for ( int i = 0; i < count; ++i)
+ {
+ aSelections.Add(GetLineFromItem(selectedItems[i]));
+ }
+
+ return count;
+}
+
+void wxMacDataItemBrowserControl::MacSetString( unsigned int n, const wxString& text )
+{
+ // as we don't store the strings we only have to issue a redraw
+ wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine( n);
+ item->SetLabel( text );
+ UpdateItem( wxMacDataBrowserRootContainer, item , kTextColumnId );
+}
+
+wxString wxMacDataItemBrowserControl::MacGetString( unsigned int n ) const
+{
+ wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
+ return item->GetLabel();
+}
+
+void wxMacDataItemBrowserControl::MacSetClientData( unsigned int n, void * data)
+{
+ wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine( n);
+ item->SetData( data );
+ // not displayed, therefore no Update infos to DataBrowser
+}
+
+void * wxMacDataItemBrowserControl::MacGetClientData( unsigned int n) const
+{
+ wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
+ return item->GetData();
+}
+
+void wxMacDataItemBrowserControl::MacScrollTo( unsigned int n )
+{
+ RevealItem( GetItemFromLine( n) , kDataBrowserRevealWithoutSelecting );
+}
+
+
+
+//
+// Tab Control
+//
+
+OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
+{
+ return ::SetTabEnabled( m_controlRef , tabNo , enable );
+}
+
+//
+// Quartz Support
+//
+
+#ifdef __WXMAC_OSX__
+// snippets from Sketch Sample from Apple :
+
+#define kGenericRGBProfilePathStr "/System/Library/ColorSync/Profiles/Generic RGB Profile.icc"
+
+/*
+ This function locates, opens, and returns the profile reference for the calibrated
+ Generic RGB color space. It is up to the caller to call CMCloseProfile when done
+ with the profile reference this function returns.
+*/
+CMProfileRef wxMacOpenGenericProfile()
+{
+ static CMProfileRef cachedRGBProfileRef = NULL;
+
+ // we only create the profile reference once
+ if (cachedRGBProfileRef == NULL)
+ {
+ CMProfileLocation loc;
+
+ loc.locType = cmPathBasedProfile;
+ strcpy(loc.u.pathLoc.path, kGenericRGBProfilePathStr);
+
+ verify_noerr( CMOpenProfile(&cachedRGBProfileRef, &loc) );
+ }
+
+ // clone the profile reference so that the caller has their own reference, not our cached one
+ if (cachedRGBProfileRef)
+ CMCloneProfileRef(cachedRGBProfileRef);
+
+ return cachedRGBProfileRef;
+}
+
+/*
+ Return the generic RGB color space. This is a 'get' function and the caller should
+ not release the returned value unless the caller retains it first. Usually callers
+ of this routine will immediately use the returned colorspace with CoreGraphics
+ so they typically do not need to retain it themselves.
+
+ This function creates the generic RGB color space once and hangs onto it so it can
+ return it whenever this function is called.
+*/
+
+CGColorSpaceRef wxMacGetGenericRGBColorSpace()
+{
+ static wxMacCFRefHolder<CGColorSpaceRef> genericRGBColorSpace;
+
+ if (genericRGBColorSpace == NULL)
+ {
+ if ( UMAGetSystemVersion() >= 0x1040 )
+ {
+ genericRGBColorSpace.Set( CGColorSpaceCreateWithName( CFSTR("kCGColorSpaceGenericRGB") ) );
+ }
+ else
+ {
+ CMProfileRef genericRGBProfile = wxMacOpenGenericProfile();
+
+ if (genericRGBProfile)
+ {
+ genericRGBColorSpace.Set( CGColorSpaceCreateWithPlatformColorSpace(genericRGBProfile) );
+
+ wxASSERT_MSG( genericRGBColorSpace != NULL, wxT("couldn't create the generic RGB color space") );
+
+ // we opened the profile so it is up to us to close it
+ CMCloseProfile(genericRGBProfile);
+ }
+ }
+ }
+
+ return genericRGBColorSpace;
+}
+#endif
+
+#ifndef __LP64__
+
+wxMacPortSaver::wxMacPortSaver( GrafPtr port )
+{
+ ::GetPort( &m_port );
+ ::SetPort( port );
+}
+
+wxMacPortSaver::~wxMacPortSaver()
+{
+ ::SetPort( m_port );
+}
+#endif
+
+void wxMacGlobalToLocal( WindowRef window , Point*pt )
+{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+ HIPoint p = CGPointMake( pt->h, pt->v );
+ HIViewRef contentView ;
+ // TODO check toolbar offset
+ HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+ HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
+ pt->h = p.x;
+ pt->v = p.y;
+#else
+ QDGlobalToLocalPoint( GetWindowPort(window), pt ) ;
+#endif
+}
+
+void wxMacLocalToGlobal( WindowRef window , Point*pt )
+{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+ HIPoint p = CGPointMake( pt->h, pt->v );
+ HIViewRef contentView ;
+ // TODO check toolbar offset
+ HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+ HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
+ pt->h = p.x;
+ pt->v = p.y;
+#else
+ QDLocalToGlobalPoint( GetWindowPort(window), pt ) ;
+#endif
+}
+
+#endif // wxUSE_GUI
projects / wxWidgets.git / blobdiff