X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cce68eaab1559c5c21dd0ce544090cc18dc8398..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/utils.cpp?ds=sidebyside diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 0fce7375e4..ed23889918 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -6,21 +6,26 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.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" - #include "wx/toplevel.h" -#else - #include "wx/intl.h" #endif #include @@ -30,7 +35,7 @@ #include #include -#include "MoreFilesX.h" +// #include "MoreFilesX.h" #ifndef __DARWIN__ #include @@ -38,453 +43,78 @@ #endif #if wxUSE_GUI -#if TARGET_API_MAC_OSX #include -#else - #include - #include -#endif - -#ifdef __DARWIN__ #include -#else - #include - #include - #include -#endif + #include "wx/mac/private/timer.h" #endif // wxUSE_GUI +#include "wx/evtloop.h" #include "wx/mac/private.h" #if defined(__MWERKS__) && wxUSE_UNICODE -#if __MWERKS__ < 0x4100 || !defined(__DARWIN__) +#if __MWERKS__ < 0x4100 #include #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; - - // are there x-platform conventions ? - + SInt32 theSystem; Gestalt(gestaltSystemVersion, &theSystem); - if (minorVsn != NULL) - *minorVsn = (theSystem & 0xFF); - if (majorVsn != NULL) + if ( majorVsn != NULL ) *majorVsn = (theSystem >> 8); -#ifdef __DARWIN__ - return wxMAC_DARWIN; -#else - return wxMAC; -#endif -} - - -#if wxUSE_BASE - -// ---------------------------------------------------------------------------- -// debugging support -// ---------------------------------------------------------------------------- - -#if defined(__WXDEBUG__) && defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400) - -// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds... - -#ifndef __MetroNubUtils__ -#include "MetroNubUtils.h" -#endif - -#ifndef __GESTALT__ -#include -#endif - -#if TARGET_API_MAC_CARBON - -#include - -extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...); - -ProcPtr gCallUniversalProc_Proc = NULL; - -#endif - -static MetroNubUserEntryBlock* gMetroNubEntry = NULL; - -static long fRunOnce = false; - - -Boolean IsMetroNubInstalled() -{ - if (!fRunOnce) - { - long result, value; - - fRunOnce = true; - gMetroNubEntry = NULL; - - if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000) - { - // look for MetroNub's Gestalt selector - if (Gestalt(kMetroNubUserSignature, &result) == noErr) - { -#if TARGET_API_MAC_CARBON - if (gCallUniversalProc_Proc == NULL) - { - CFragConnectionID connectionID; - Ptr mainAddress; - Str255 errorString; - ProcPtr symbolAddress; - OSErr err; - CFragSymbolClass symbolClass; - - symbolAddress = NULL; - err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag, - &connectionID, &mainAddress, errorString); - - if (err != noErr) - { - gCallUniversalProc_Proc = NULL; - goto end; - } - - err = FindSymbol(connectionID, "\pCallUniversalProc", - (Ptr *) &gCallUniversalProc_Proc, &symbolClass); - - if (err != noErr) - { - gCallUniversalProc_Proc = NULL; - goto end; - } - } -#endif - - { - MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result; - - // make sure the version of the API is compatible - if (block->apiLowVersion <= kMetroNubUserAPIVersion && - kMetroNubUserAPIVersion <= block->apiHiVersion) - { - // success! - gMetroNubEntry = block; - } - } - } - } - } - -end: + if ( minorVsn != NULL ) + *minorVsn = (theSystem & 0xFF); -#if TARGET_API_MAC_CARBON - return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL); +#if defined( __DARWIN__ ) + return wxOS_MAC_OSX_DARWIN; #else - return (gMetroNubEntry != NULL); + return wxOS_MAC_OS; #endif } -Boolean IsMWDebuggerRunning() -{ - if (IsMetroNubInstalled()) - return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning); - - return false; -} - -Boolean AmIBeingMWDebugged() -{ - if (IsMetroNubInstalled()) - return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged); - - return false; -} - -extern bool WXDLLEXPORT wxIsDebuggerRunning() -{ - return IsMWDebuggerRunning() && AmIBeingMWDebugged(); -} - -#else - extern bool WXDLLEXPORT wxIsDebuggerRunning() { + // TODO : try to find out ... return false; } -#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400) - - -#ifndef __DARWIN__ -// defined in unix/utilsunx.cpp for Mac OS X - -// get full hostname (with domain name if possible) -bool wxGetFullHostName(wxChar *buf, int maxSize) -{ - 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(); - 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 ); - } - - 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(); - 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 ); - } - - return true; -} - -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; -} - -// 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; -} - -// Execute a program in an Interactive Shell -bool wxShell(const wxString& command) -{ - // TODO - return false; -} - -// Shutdown or reboot the PC -bool wxShutdown(wxShutdownFlags wFlags) -{ - // TODO - return false; -} - -wxPowerType wxGetPowerType() -{ - // TODO - return wxPOWER_UNKNOWN; -} - -wxBatteryState wxGetBatteryState() -{ - // TODO - return wxBATTERY_UNKNOWN_STATE; -} - -// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) -wxMemorySize wxGetFreeMemory() -{ - return (wxMemorySize)FreeMem(); -} - -#ifndef __DARWIN__ - -void wxMicroSleep(unsigned long microseconds) -{ - AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime()); - MPDelayUntil( & wakeup); -} - -void wxMilliSleep(unsigned long milliseconds) -{ - AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime()); - MPDelayUntil( & wakeup); -} - -void wxSleep(int nSecs) -{ - wxMilliSleep(1000*nSecs); -} - -#endif - -// Consume all events until no more left -void wxFlushEvents() -{ -} - -#endif // !__DARWIN__ - // 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() +wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const { - static wxToolkitInfo info; + // We suppose that toolkit version is the same as OS version under Mac + wxGetOsVersion(verMaj, verMin); - 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; + return wxPORT_MAC; } -// 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) +wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() { - // TODO - return false; + return new wxEventLoop; } -bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file) +wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) { - 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) -{ - wxString buf; - buf.Printf(wxT("%ld"), value); - - return wxWriteResource(section, entry, buf, file); + return new wxCarbonTimerImpl(timer); } -bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file) -{ - 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 succ; -} - -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 succ; -} - -bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file) -{ - char *s = NULL; - bool succ = wxGetResource(section, entry, (char **)&s, file); - if (succ) - { - *value = (int)strtol(s, NULL, 10); - delete[] s; - } - - return succ; -} -#endif // wxUSE_RESOURCES - int gs_wxBusyCursorCount = 0; extern wxCursor gMacCurrentCursor; wxCursor gMacStoredActiveCursor; @@ -496,6 +126,8 @@ void wxBeginBusyCursor(const wxCursor *cursor) { gMacStoredActiveCursor = gMacCurrentCursor; cursor->MacInstall(); + + wxSetCursor(*cursor); } //else: nothing to do, already set } @@ -510,6 +142,8 @@ void wxEndBusyCursor() { gMacStoredActiveCursor.MacInstall(); gMacStoredActiveCursor = wxNullCursor; + + wxSetCursor(wxNullCursor); } } @@ -551,7 +185,7 @@ wxString wxMacFindFolder( short vol, // Check whether this window wants to process messages, e.g. Stop button // in long calculations. -bool wxCheckForInterrupt(wxWindow *wnd) +bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd)) { // TODO return false; @@ -559,12 +193,14 @@ bool wxCheckForInterrupt(wxWindow *wnd) void wxGetMousePosition( int* x, int* y ) { +#if wxMAC_USE_QUICKDRAW Point pt; - - GetMouse( &pt ); - LocalToGlobal( &pt ); + GetGlobalMouse(&pt); *x = pt.h; *y = pt.v; +#else + // TODO +#endif }; // Return true if we have a colour display @@ -576,29 +212,31 @@ bool wxColourDisplay() // Returns depth of screen int wxDisplayDepth() { +#if wxMAC_USE_QUICKDRAW + int theDepth = (int) CGDisplayBitsPerPixel(CGMainDisplayID()); Rect globRect; SetRect(&globRect, -32760, -32760, 32760, 32760); GDHandle theMaxDevice; - int theDepth = 8; theMaxDevice = GetMaxDevice(&globRect); if (theMaxDevice != NULL) theDepth = (**(**theMaxDevice).gdPMap).pixelSize; return theDepth; +#else + return 32; // TODO +#endif } // Get size of display void wxDisplaySize(int *width, int *height) { - BitMap screenBits; - GetQDGlobalsScreenBits( &screenBits ); - - if (width != NULL) - *width = screenBits.bounds.right - screenBits.bounds.left; - - if (height != NULL) - *height = screenBits.bounds.bottom - screenBits.bounds.top; + // TODO adapt for multi-displays + CGRect bounds = CGDisplayBounds(CGMainDisplayID()); + if ( width ) + *width = (int)bounds.size.width ; + if ( height ) + *height = (int)bounds.size.height; } void wxDisplaySizeMM(int *width, int *height) @@ -616,8 +254,34 @@ void wxDisplaySizeMM(int *width, int *height) void wxClientDisplayRect(int *x, int *y, int *width, int *height) { - Rect r; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 +#if wxMAC_USE_QUICKDRAW + 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 + int w, h; + wxDisplaySize(&w,&h); + if ( x ) + *x = 0; + if ( y ) + *y = 24; + if ( width ) + *width = w; + if ( height ) + *height = h-24; +#endif +#else + Rect r; GetAvailableWindowPositioningBounds( GetMainDevice() , &r ); if ( x ) *x = r.left; @@ -627,6 +291,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) *width = r.right - r.left; if ( height ) *height = r.bottom - r.top; +#endif } wxWindow* wxFindWindowAtPoint(const wxPoint& pt) @@ -649,10 +314,10 @@ wxString wxGetOsDescription() } #ifndef __DARWIN__ -wxChar *wxGetUserHome (const wxString& user) +wxString wxGetUserHome (const wxString& user) { // TODO - return NULL; + return wxString(); } bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree) @@ -720,52 +385,34 @@ wxString wxMacMakeStringFromPascal( ConstStringPtr from ) // Common Event Support // ---------------------------------------------------------------------------- -extern ProcessSerialNumber gAppProcess; - void wxMacWakeUp() { - ProcessSerialNumber psn; - Boolean isSame; - psn.highLongOfPSN = 0; - psn.lowLongOfPSN = kCurrentProcess; - SameProcess( &gAppProcess , &psn , &isSame ); - if ( isSame ) - { -#if TARGET_CARBON - OSStatus err = noErr; + OSStatus err = noErr; #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 ) - { - - if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) ) - return; - s_wakeupEvent.SetCurrentTime(); - err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent, - kEventPriorityHigh ); - } -#else - wxMacCarbonEvent wakeupEvent; - wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(), - kEventAttributeNone ); - err = PostEventToQueue(GetMainEventQueue(), wakeupEvent, - kEventPriorityHigh ); -#endif -#else - PostEvent( nullEvent , 0 ); -#endif + // 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 ); } - else + if ( err == noErr ) { - WakeUpProcess( &gAppProcess ); + + if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) ) + return; + s_wakeupEvent.SetCurrentTime(); + err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent, + kEventPriorityHigh ); } +#else + wxMacCarbonEvent wakeupEvent; + wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(), + kEventAttributeNone ); + err = PostEventToQueue(GetMainEventQueue(), wakeupEvent, + kEventPriorityHigh ); +#endif } #endif // wxUSE_BASE @@ -822,19 +469,26 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in // Control Access Support // ---------------------------------------------------------------------------- +#if wxMAC_USE_QUICKDRAW + +IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject ) + +wxMacControl::wxMacControl() +{ + Init(); +} + wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl ) { Init(); m_peer = peer; m_isRootControl = isRootControl; - m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing(); } wxMacControl::wxMacControl( wxWindow* peer , ControlRef control ) { Init(); m_peer = peer; - m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing(); m_controlRef = control; } @@ -842,7 +496,6 @@ wxMacControl::wxMacControl( wxWindow* peer , WXWidget control ) { Init(); m_peer = peer; - m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing(); m_controlRef = (ControlRef) control; } @@ -855,17 +508,23 @@ void wxMacControl::Init() m_peer = NULL; m_controlRef = NULL; m_needsFocusRect = false; - m_isCompositing = false; m_isRootControl = false; } void wxMacControl::Dispose() { - ::DisposeControl( m_controlRef ); + 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 ); } @@ -887,13 +546,8 @@ OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size OSStatus wxMacControl::SendEvent( EventRef event , OptionBits inOptions ) { -#if TARGET_API_MAC_OSX return SendEventToEventTargetWithOptions( event, HIObjectGetEventTarget( (HIObjectRef) m_controlRef ), inOptions ); -#else - #pragma unused(inOptions) - return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) ); -#endif } OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions ) @@ -982,7 +636,7 @@ bool wxMacControl::NeedsFocusRect() const return m_needsFocusRect; } -void wxMacControl::VisibilityChanged(bool shown) +void wxMacControl::VisibilityChanged(bool WXUNUSED(shown)) { } @@ -993,6 +647,29 @@ void wxMacControl::SuperChangedPosition() void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) { m_font = font; +#if wxMAC_USE_CORE_TEXT + if ( UMAGetSystemVersion() >= 0x1050 ) + { + HIViewPartCode part = 0; + HIThemeTextHorizontalFlush flush = kHIThemeTextHorizontalFlushDefault; + if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL ) + flush = kHIThemeTextHorizontalFlushCenter; + else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT ) + flush = kHIThemeTextHorizontalFlushRight; + HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.MacGetCTFont() ); + HIViewSetTextHorizontalFlush( m_controlRef, part, flush ); + + if ( foreground != *wxBLACK ) + { + ControlFontStyleRec fontStyle; + foreground.GetRGBColor( &fontStyle.foreColor ); + fontStyle.flags = kControlUseForeColorMask; + ::SetControlFontStyle( m_controlRef , &fontStyle ); + } + + } +#endif +#if wxMAC_USE_ATSU_TEXT ControlFontStyleRec fontStyle; if ( font.MacGetThemeFontID() != kThemeCurrentPortFont ) { @@ -1038,17 +715,17 @@ void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , l if ( foreground != *wxBLACK ) { - fontStyle.foreColor = MAC_WXCOLORREF( foreground.GetPixel() ); + foreground.GetRGBColor( &fontStyle.foreColor ); fontStyle.flags |= kControlUseForeColorMask; } ::SetControlFontStyle( m_controlRef , &fontStyle ); +#endif } -void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) ) +void wxMacControl::SetBackgroundColour( const wxColour &WXUNUSED(col) ) { - // TODO - // setting up a color proc is not recommended anymore +// HITextViewSetBackgroundColor( m_textView , color ); } void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum ) @@ -1059,7 +736,11 @@ void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum ) short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers ) { +#ifndef __LP64__ return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ); +#else + return 0; +#endif } void wxMacControl::SetActionProc( ControlActionUPP actionProc ) @@ -1089,11 +770,7 @@ void wxMacControl::SetVisibility( bool visible , bool redraw ) bool wxMacControl::IsEnabled() const { -#if TARGET_API_MAC_OSX return IsControlEnabled( m_controlRef ); -#else - return IsControlActive( m_controlRef ); -#endif } bool wxMacControl::IsActive() const @@ -1103,72 +780,28 @@ bool wxMacControl::IsActive() const 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 ); - else - DeactivateControl( m_controlRef ); -#endif } void wxMacControl::SetDrawingEnabled( bool enable ) { -#if TARGET_API_MAC_OSX HIViewSetDrawingEnabled( m_controlRef , enable ); -#endif } -#if TARGET_API_MAC_OSX bool wxMacControl::GetNeedsDisplay() const { -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) - { - return HIViewGetNeedsDisplay( m_controlRef ); - } - else -#endif - { - if ( !IsVisible() ) - return false; - - Rect controlBounds; - GetControlBounds( m_controlRef, &controlBounds ); - RgnHandle rgn = NewRgn(); - GetWindowRegion ( GetControlOwner( m_controlRef ) , kWindowUpdateRgn , rgn ); - Boolean intersect = RectInRgn ( &controlBounds , rgn ); - DisposeRgn( rgn ); - - return intersect; - } + return HIViewGetNeedsDisplay( m_controlRef ); } -#endif void wxMacControl::SetNeedsDisplay( RgnHandle where ) { if ( !IsVisible() ) return; -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) - { - HIViewSetNeedsDisplayInRegion( m_controlRef , where , true ); - } - else -#endif - { - Rect controlBounds; - GetControlBounds( m_controlRef, &controlBounds ); - RgnHandle update = NewRgn(); - CopyRgn( where , update ); - OffsetRgn( update , controlBounds.left , controlBounds.top ); - InvalWindowRgn( GetControlOwner( m_controlRef) , update ); - } + HIViewSetNeedsDisplayInRegion( m_controlRef , where , true ); } void wxMacControl::SetNeedsDisplay( Rect* where ) @@ -1176,138 +809,57 @@ void wxMacControl::SetNeedsDisplay( Rect* where ) if ( !IsVisible() ) return; -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) + if ( where != NULL ) { - if ( where != NULL ) - { - RgnHandle update = NewRgn(); - RectRgn( update , where ); - HIViewSetNeedsDisplayInRegion( m_controlRef , update , true ); - DisposeRgn( update ); - } - else - HIViewSetNeedsDisplay( m_controlRef , true ); + RgnHandle update = NewRgn(); + RectRgn( update , where ); + HIViewSetNeedsDisplayInRegion( m_controlRef , update , true ); + DisposeRgn( update ); } else -#endif - { - Rect controlBounds; - - GetControlBounds( m_controlRef, &controlBounds ); - if ( where ) - { - Rect whereLocal = *where; - OffsetRect( &whereLocal , controlBounds.left , controlBounds.top ); - SectRect( &controlBounds , &whereLocal, &controlBounds ); - } - - InvalWindowRect( GetControlOwner( m_controlRef) , &controlBounds ); - } + HIViewSetNeedsDisplay( m_controlRef , true ); } void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to ) { -#if TARGET_API_MAC_OSX - if ( from->m_peer->MacGetTopLevelWindow()->MacUsesCompositing() ) - { - 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; - } - else -#endif - { - Rect fromRect, toRect; - - GetControlBounds( from->m_controlRef , &fromRect ); - GetControlBounds( to->m_controlRef , &toRect ); - if ( from->m_isRootControl ) - fromRect.left = fromRect.top = 0; - if ( to->m_isRootControl ) - toRect.left = toRect.top = 0; - - pt->x = pt->x + fromRect.left - toRect.left; - pt->y = pt->y + fromRect.top - toRect.top; - } -} - -void wxMacControl::SetRect( Rect *r ) -{ -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) - { - //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 - } - else -#endif - { - bool vis = IsVisible(); - if ( vis ) - { - Rect former; - GetControlBounds( m_controlRef , &former ); - InvalWindowRect( GetControlOwner( m_controlRef ) , &former ); - } - - Rect controlBounds = *r; + HIPoint hiPoint; - // since the rect passed in is always (even in non-compositing) relative - // to the (native) parent, we have to adjust to window relative here - wxMacControl* parent = m_peer->GetParent()->GetPeer(); - if ( !parent->m_isRootControl ) - { - Rect superRect; - GetControlBounds( parent->m_controlRef , &superRect ); - OffsetRect( &controlBounds , superRect.left , superRect.top ); - } + 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; +} - SetControlBounds( m_controlRef , &controlBounds ); - if ( vis ) - InvalWindowRect( GetControlOwner( m_controlRef ) , &controlBounds ); - } +void wxMacControl::SetRect( Rect *r ) +{ + //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 ) { GetControlBounds( m_controlRef , r ); - if ( !m_isCompositing ) - { - // correct the case of the root control - if ( m_isRootControl ) - { - WindowRef wr = GetControlOwner( m_controlRef ); - GetWindowBounds( wr , kWindowContentRgn , r ); - r->right -= r->left; - r->bottom -= r->top; - r->left = 0; - r->top = 0; - } - else - { - wxMacControl* parent = m_peer->GetParent()->GetPeer(); - if ( !parent->m_isRootControl ) - { - Rect superRect; - GetControlBounds( parent->m_controlRef , &superRect ); - OffsetRect( r , -superRect.left , -superRect.top ); - } - } - } } void wxMacControl::GetRectInWindowCoords( Rect *r ) { - UMAGetControlBoundsInWindowCoords( m_controlRef , r ); + GetControlBounds( m_controlRef , r ) ; + + WindowRef tlwref = GetControlOwner( m_controlRef ) ; + + wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ; + if ( tlwwx != NULL ) + { + ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ; + HIPoint hiPoint = CGPointMake( 0 , 0 ) ; + HIViewConvertPoint( &hiPoint , HIViewGetSuperview(m_controlRef) , rootControl ) ; + OffsetRect( r , (short) hiPoint.x , (short) hiPoint.y ) ; + } } void wxMacControl::GetBestRect( Rect *r ) @@ -1326,7 +878,7 @@ void wxMacControl::SetLabel( const wxString &title ) else encoding = wxFont::GetDefaultEncoding(); - UMASetControlTitle( m_controlRef , title , encoding ); + SetControlTitleWithCFString( m_controlRef , wxCFStringRef( title , encoding ) ); } void wxMacControl::GetFeatures( UInt32 * features ) @@ -1337,32 +889,15 @@ void wxMacControl::GetFeatures( UInt32 * features ) OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region ) { OSStatus err = GetControlRegion( m_controlRef , partCode , region ); - if ( !m_isCompositing ) - { - if ( !m_isRootControl ) - { - Rect r; - - GetControlBounds(m_controlRef, &r ); - if ( !EmptyRgn( region ) ) - OffsetRgn( region , -r.left , -r.top ); - } - } - return err; } 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); -#else - return 0; -#endif } -#if TARGET_API_MAC_OSX // SetNeedsDisplay would not invalidate the children static void InvalidateControlAndChildren( HIViewRef control ) { @@ -1385,57 +920,34 @@ static void InvalidateControlAndChildren( HIViewRef control ) InvalidateControlAndChildren( child ); } } -#endif void wxMacControl::InvalidateWithChildren() { -#if TARGET_API_MAC_OSX InvalidateControlAndChildren( m_controlRef ); -#endif } void wxMacControl::ScrollRect( wxRect *r , int dx , int dy ) { wxASSERT( r != NULL ); -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) - { - HIRect scrollarea = CGRectMake( r->x , r->y , r->width , r->height); - HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ); - } - else -#endif - { - Rect bounds; - - GetControlBounds( m_controlRef , &bounds ); - bounds.left += r->x; - bounds.top += r->y; - bounds.bottom = bounds.top + r->height; - bounds.right = bounds.left + r->width; - wxMacWindowClipper clip( m_peer ); - RgnHandle updateRgn = NewRgn(); - ::ScrollRect( &bounds , dx , dy , updateRgn ); - InvalWindowRgn( GetControlOwner( m_controlRef ) , updateRgn ); - DisposeRgn( updateRgn ); - } + HIRect scrollarea = CGRectMake( r->x , r->y , r->width , r->height); + HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ); } OSType wxMacCreator = 'WXMC'; OSType wxMacControlProperty = 'MCCT'; -void wxMacControl::SetReferenceInNativeControl() +void wxMacControl::SetReferenceInNativeControl() { void * data = this; verify_noerr( SetControlProperty ( m_controlRef , wxMacCreator,wxMacControlProperty, sizeof(data), &data ) ); } -wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) +wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) { wxMacControl* ctl = NULL; - UInt32 actualSize; + ByteCount actualSize; if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) , &actualSize , &ctl ) == noErr ) { @@ -1451,13 +963,15 @@ wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) // basing on DataBrowserItemIDs // +IMPLEMENT_ABSTRACT_CLASS( wxMacDataBrowserControl , wxMacControl ) + pascal void wxMacDataBrowserControl::DataBrowserItemNotificationProc( ControlRef browser, DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData ) { - wxMacDataBrowserControl* ctl = dynamic_cast( wxMacControl::GetReferenceFromNativeControl( browser ) ); + wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl); if ( ctl != 0 ) { ctl->ItemNotification(itemID, message, itemData); @@ -1472,8 +986,7 @@ pascal OSStatus wxMacDataBrowserControl::DataBrowserGetSetItemDataProc( Boolean changeValue ) { OSStatus err = errDataBrowserPropertyNotSupported; - - wxMacDataBrowserControl* ctl = dynamic_cast( wxMacControl::GetReferenceFromNativeControl( browser ) ); + wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl); if ( ctl != 0 ) { err = ctl->GetSetItemData(itemID, property, itemData, changeValue); @@ -1482,12 +995,12 @@ pascal OSStatus wxMacDataBrowserControl::DataBrowserGetSetItemDataProc( } pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc( - ControlRef browser, - DataBrowserItemID itemOneID, - DataBrowserItemID itemTwoID, - DataBrowserPropertyID sortProperty) + ControlRef browser, + DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty) { - wxMacDataBrowserControl* ctl = dynamic_cast( wxMacControl::GetReferenceFromNativeControl( browser ) ); + wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl); if ( ctl != 0 ) { return ctl->CompareItems(itemOneID, itemTwoID, sortProperty); @@ -1499,8 +1012,12 @@ DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL; DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL; DataBrowserItemCompareUPP gDataBrowserItemCompareUPP = NULL; -wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style) : wxMacControl( peer ) -{ +wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, + const wxPoint& pos, + const wxSize& size, + long WXUNUSED(style)) + : wxMacControl( peer ) +{ Rect bounds = wxMacGetBoundsForControl( peer, pos, size ); OSStatus err = ::CreateDataBrowserControl( MAC_WXHWND(peer->MacGetTopLevelWindowRef()), @@ -1514,11 +1031,7 @@ wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& if ( gDataBrowserItemNotificationUPP == NULL ) { gDataBrowserItemNotificationUPP = -#if TARGET_API_MAC_OSX (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc); -#else - NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc); -#endif } DataBrowserCallbacks callbacks; @@ -1534,17 +1047,17 @@ wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, - UInt32 *numItems) const + ItemCount *numItems) const { - return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems ); + return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems ); } OSStatus wxMacDataBrowserControl::GetItems( DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, - Handle items) const + Handle items) const { - return GetDataBrowserItems( m_controlRef, container, recurse, state, items ); + return GetDataBrowserItems( m_controlRef, container, recurse, state, items ); } OSStatus wxMacDataBrowserControl::SetSelectionFlags( DataBrowserSelectionFlags options ) @@ -1558,6 +1071,17 @@ OSStatus wxMacDataBrowserControl::AddColumn( DataBrowserListViewColumnDesc *colu 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); @@ -1588,7 +1112,7 @@ OSStatus wxMacDataBrowserControl::SetCallbacks(const DataBrowserCallbacks *callb return SetDataBrowserCallbacks( m_controlRef, callbacks ); } -OSStatus wxMacDataBrowserControl::UpdateItems( +OSStatus wxMacDataBrowserControl::UpdateItems( DataBrowserItemID container, UInt32 numItems, const DataBrowserItemID *items, @@ -1652,166 +1176,253 @@ OSStatus wxMacDataBrowserControl::GetItemRow( DataBrowserItemID item, DataBrowse return GetDataBrowserTableViewItemRow( m_controlRef, item, row ); } -OSStatus wxMacDataBrowserControl::SetDefaultRowHeight( UInt16 height ) +OSStatus wxMacDataBrowserControl::SetDefaultRowHeight( UInt16 height ) { - return SetDataBrowserTableViewRowHeight( m_controlRef , height ); + return SetDataBrowserTableViewRowHeight( m_controlRef , height ); } -OSStatus wxMacDataBrowserControl::GetDefaultRowHeight( UInt16 * height ) const +OSStatus wxMacDataBrowserControl::GetDefaultRowHeight( UInt16 * height ) const { - return GetDataBrowserTableViewRowHeight( m_controlRef, height ); + return GetDataBrowserTableViewRowHeight( m_controlRef, height ); } - -OSStatus wxMacDataBrowserControl::SetRowHeight( DataBrowserItemID item , UInt16 height) + +OSStatus wxMacDataBrowserControl::SetRowHeight( DataBrowserItemID item , UInt16 height) { return SetDataBrowserTableViewItemRowHeight( m_controlRef, item , height ); } -OSStatus wxMacDataBrowserControl::GetRowHeight( DataBrowserItemID item , UInt16 *height) const +OSStatus wxMacDataBrowserControl::GetRowHeight( DataBrowserItemID item , UInt16 *height) const { return GetDataBrowserTableViewItemRowHeight( m_controlRef, item , height); } -OSStatus wxMacDataBrowserControl::GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const +OSStatus wxMacDataBrowserControl::GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const { return GetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width ); } -OSStatus wxMacDataBrowserControl::SetColumnWidth( DataBrowserPropertyID column , UInt16 width ) +OSStatus wxMacDataBrowserControl::SetColumnWidth( DataBrowserPropertyID column , UInt16 width ) { return SetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width ); } -OSStatus wxMacDataBrowserControl::GetDefaultColumnWidth( UInt16 *width ) const +OSStatus wxMacDataBrowserControl::GetDefaultColumnWidth( UInt16 *width ) const { return GetDataBrowserTableViewColumnWidth( m_controlRef , width ); } -OSStatus wxMacDataBrowserControl::SetDefaultColumnWidth( UInt16 width ) +OSStatus wxMacDataBrowserControl::SetDefaultColumnWidth( UInt16 width ) { return SetDataBrowserTableViewColumnWidth( m_controlRef , width ); } -OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const +OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const { return GetDataBrowserTableViewColumnCount( m_controlRef, numColumns); } -OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column, - UInt32 *position) const +OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column, + DataBrowserTableViewColumnIndex *position) const { return GetDataBrowserTableViewColumnPosition( m_controlRef , column , position); } -OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, UInt32 position) +OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position) { return SetDataBrowserTableViewColumnPosition( m_controlRef , column , position); } -OSStatus wxMacDataBrowserControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const +OSStatus wxMacDataBrowserControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const { return GetDataBrowserScrollPosition( m_controlRef , top , left ); } -OSStatus wxMacDataBrowserControl::SetScrollPosition( UInt32 top , UInt32 left ) +OSStatus wxMacDataBrowserControl::SetScrollPosition( UInt32 top , UInt32 left ) { return SetDataBrowserScrollPosition( m_controlRef , top , left ); } -OSStatus wxMacDataBrowserControl::GetSortProperty( DataBrowserPropertyID *column ) const +OSStatus wxMacDataBrowserControl::GetSortProperty( DataBrowserPropertyID *column ) const { return GetDataBrowserSortProperty( m_controlRef , column ); } -OSStatus wxMacDataBrowserControl::SetSortProperty( DataBrowserPropertyID column ) +OSStatus wxMacDataBrowserControl::SetSortProperty( DataBrowserPropertyID column ) { return SetDataBrowserSortProperty( m_controlRef , column ); } - -OSStatus wxMacDataBrowserControl::GetSortOrder( DataBrowserSortOrder *order ) const + +OSStatus wxMacDataBrowserControl::GetSortOrder( DataBrowserSortOrder *order ) const { return GetDataBrowserSortOrder( m_controlRef , order ); } -OSStatus wxMacDataBrowserControl::SetSortOrder( DataBrowserSortOrder order ) +OSStatus wxMacDataBrowserControl::SetSortOrder( DataBrowserSortOrder order ) { return SetDataBrowserSortOrder( m_controlRef , order ); } -OSStatus wxMacDataBrowserControl::GetPropertyFlags( DataBrowserPropertyID property, - DataBrowserPropertyFlags *flags ) const +OSStatus wxMacDataBrowserControl::GetPropertyFlags( DataBrowserPropertyID property, + DataBrowserPropertyFlags *flags ) const { return GetDataBrowserPropertyFlags( m_controlRef , property , flags ); } -OSStatus wxMacDataBrowserControl::SetPropertyFlags( DataBrowserPropertyID property, - DataBrowserPropertyFlags flags ) +OSStatus wxMacDataBrowserControl::SetPropertyFlags( DataBrowserPropertyID property, + DataBrowserPropertyFlags flags ) { return SetDataBrowserPropertyFlags( m_controlRef , property , flags ); } -OSStatus wxMacDataBrowserControl::GetHeaderDesc( DataBrowserPropertyID property, - DataBrowserListViewHeaderDesc *desc ) const +OSStatus wxMacDataBrowserControl::GetHeaderDesc( DataBrowserPropertyID property, + DataBrowserListViewHeaderDesc *desc ) const { return GetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); } -OSStatus wxMacDataBrowserControl::SetHeaderDesc( DataBrowserPropertyID property, - DataBrowserListViewHeaderDesc *desc ) +OSStatus wxMacDataBrowserControl::SetHeaderDesc( DataBrowserPropertyID property, + DataBrowserListViewHeaderDesc *desc ) { - return SetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); + return SetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); } -OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID property , - Boolean expandableRows ) +OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID property , + Boolean expandableRows ) { return SetDataBrowserListViewDisclosureColumn( m_controlRef, property, expandableRows); } // ============================================================================ -// Higher-level Databrowser +// Higher-level Databrowser // ============================================================================ // // basing on data item objects // wxMacDataItem::wxMacDataItem() -{ +{ + 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; } -wxMacDataItem::~wxMacDataItem() -{ +SInt32 wxMacDataItem::GetOrder() const +{ + return m_order; } - -bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner , - const wxMacDataItem*, - DataBrowserPropertyID property) const + +void wxMacDataItem::SetData( void* data) { - return false; + m_data = data; } -OSStatus wxMacDataItem::GetSetData(wxMacDataItemBrowserControl *owner , +void* wxMacDataItem::GetData() const +{ + return m_data; +} + +short wxMacDataItem::GetColumn() +{ + return m_colId; +} + +void wxMacDataItem::SetColumn( short col ) +{ + m_colId = col; +} + +void wxMacDataItem::SetLabel( const wxString& str) +{ + m_label = str; + m_cfLabel = wxCFStringRef( str , wxLocale::GetSystemEncoding()); +} + +const wxString& wxMacDataItem::GetLabel() const +{ + return m_label; +} + +bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *WXUNUSED(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 *WXUNUSED(owner) , DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - bool changeValue ) + bool changeValue ) { - return errDataBrowserPropertyNotSupported; + 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 +void wxMacDataItem::Notification(wxMacDataItemBrowserControl *WXUNUSED(owner) , + DataBrowserItemNotification WXUNUSED(message), + DataBrowserItemDataRef WXUNUSED(itemData) ) const { } +IMPLEMENT_DYNAMIC_CLASS( wxMacDataItemBrowserControl , wxMacDataBrowserControl ) -wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) : +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) + +wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser) { m_former = browser->SuppressSelection(true); m_browser = browser; @@ -1830,18 +1441,18 @@ bool wxMacDataItemBrowserControl::SuppressSelection( bool suppress ) return former; } -Boolean wxMacDataItemBrowserControl::CompareItems(DataBrowserItemID itemOneID, - DataBrowserItemID itemTwoID, - DataBrowserPropertyID sortProperty) +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 wxMacDataItemBrowserControl::CompareItems(const wxMacDataItem* itemOne, + const wxMacDataItem* itemTwo, + DataBrowserPropertyID sortProperty) { Boolean retval = false; if ( itemOne != NULL ) @@ -1853,7 +1464,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( DataBrowserItemID itemID, DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - Boolean changeValue ) + Boolean changeValue ) { wxMacDataItem* item = (wxMacDataItem*) itemID; return GetSetItemData(item, property, itemData , changeValue ); @@ -1863,7 +1474,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( wxMacDataItem* item, DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - Boolean changeValue ) + Boolean changeValue ) { OSStatus err = errDataBrowserPropertyNotSupported; switch( property ) @@ -1874,10 +1485,12 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( // right now default behaviour on these break; default : - if ( item != NULL ) + + if ( item != NULL ){ err = item->GetSetData( this, property , itemData , changeValue ); + } break; - + } return err; } @@ -1885,36 +1498,43 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( void wxMacDataItemBrowserControl::ItemNotification( DataBrowserItemID itemID, DataBrowserItemNotification message, - DataBrowserItemDataRef itemData) + DataBrowserItemDataRef itemData) { - wxMacDataItem* item = (wxMacDataItem*) itemID; + wxMacDataItem* item = (wxMacDataItem*) itemID; ItemNotification( item , message, itemData); } void wxMacDataItemBrowserControl::ItemNotification( const wxMacDataItem* item, DataBrowserItemNotification message, - DataBrowserItemDataRef itemData) + DataBrowserItemDataRef itemData) { if (item != NULL) item->Notification( this, message, itemData); } -unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container, - bool recurse , DataBrowserItemState state) const +unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container, + bool recurse , DataBrowserItemState state) const { - UInt32 numItems = 0; - verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container, - recurse, state, &numItems ) ); + ItemCount numItems = 0; + verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container, + recurse, state, &numItems ) ); return numItems; } -void wxMacDataItemBrowserControl::GetItems(const wxMacDataItem* container, - bool recurse , DataBrowserItemState state, wxArrayMacDataItemPtr &items) const +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) ); + verify_noerr( wxMacDataBrowserControl::GetItems( (DataBrowserItemID)container , + recurse , state, handle) ); int itemCount = GetHandleSize(handle)/sizeof(DataBrowserItemID); HLock( handle ); @@ -1940,17 +1560,17 @@ wxMacDataItem* wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) con DataBrowserItemID id; OSStatus err = GetItemID( (DataBrowserTableViewRowIndex) n , &id); wxASSERT( err == noErr); - return (wxMacDataItem*) id; + return (wxMacDataItem*) id; } -void wxMacDataItemBrowserControl::UpdateItem(const wxMacDataItem *container, +void wxMacDataItemBrowserControl::UpdateItem(const wxMacDataItem *container, const wxMacDataItem *item , DataBrowserPropertyID property) const { - verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, 1, + verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, 1, (DataBrowserItemID*) &item, kDataBrowserItemNoProperty /* notSorted */, property ) ); } -void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, +void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray , DataBrowserPropertyID property) const { unsigned int noItems = itemArray.GetCount(); @@ -1958,66 +1578,124 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, for ( unsigned int i = 0; i < noItems; ++i ) items[i] = (DataBrowserItemID) itemArray[i]; - verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, noItems, + 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(); + wxCFStringRef cfTitle( 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; + columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn; + columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton; + + 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, + verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, 1, (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ) ); } -void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray ) +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, + verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, noItems, (DataBrowserItemID*) items, kDataBrowserItemNoProperty ) ); delete [] items; } -void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item) +void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item) { - OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1, - (UInt32*) &item, kDataBrowserItemNoProperty ); + OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1, + (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ); verify_noerr( err ); } -void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray) +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, - (UInt32*) items, kDataBrowserItemNoProperty ); + OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems, + (DataBrowserItemID*) items, kDataBrowserItemNoProperty ); verify_noerr( err ); delete [] items; } -void wxMacDataItemBrowserControl::RemoveAllItems(wxMacDataItem *container) +void wxMacDataItemBrowserControl::RemoveAllItems(wxMacDataItem *container) { OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 0 , NULL , kDataBrowserItemNoProperty ); verify_noerr( err ); } -void wxMacDataItemBrowserControl::SetSelectedItem(wxMacDataItem* item , DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedItem(wxMacDataItem* item , DataBrowserSetOption option) { verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 1, (DataBrowserItemID*) &item, option )); } -void wxMacDataItemBrowserControl::SetSelectedAllItems(DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedAllItems(DataBrowserSetOption option) { verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 0 , NULL , option )); } -void wxMacDataItemBrowserControl::SetSelectedItems(wxArrayMacDataItemPtr &itemArray , DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedItems(wxArrayMacDataItemPtr &itemArray , DataBrowserSetOption option) { unsigned int noItems = itemArray.GetCount(); DataBrowserItemID *items = new DataBrowserItemID[noItems]; @@ -2033,63 +1711,230 @@ Boolean wxMacDataItemBrowserControl::IsItemSelected( const wxMacDataItem* item) return wxMacDataBrowserControl::IsItemSelected( (DataBrowserItemID) item); } -void wxMacDataItemBrowserControl::RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options) +void wxMacDataItemBrowserControl::RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options) { verify_noerr(wxMacDataBrowserControl::RevealItem( (DataBrowserItemID) item, kDataBrowserNoItem , options ) ); } -void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const +void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const { - verify_noerr(wxMacDataBrowserControl::GetSelectionAnchor( (DataBrowserItemID*) first, (DataBrowserItemID*) last) ); + verify_noerr(wxMacDataBrowserControl::GetSelectionAnchor( (DataBrowserItemID*) first, (DataBrowserItemID*) last) ); } - +wxClientDataType wxMacDataItemBrowserControl::GetClientDataType() const +{ + return m_clientDataItemsType; +} +void wxMacDataItemBrowserControl::SetClientDataType(wxClientDataType clientDataItemsType) +{ + m_clientDataItemsType = clientDataItemsType; +} -// -// Tab Control -// +unsigned int wxMacDataItemBrowserControl::MacGetCount() const +{ + return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState); +} -OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable ) +void wxMacDataItemBrowserControl::MacDelete( unsigned int n ) { - return ::SetTabEnabled( m_controlRef , tabNo , enable ); + wxMacDataItem* item = (wxMacDataItem*)GetItemFromLine( n ); + RemoveItem( wxMacDataBrowserRootContainer, item ); } -// -// Quartz Support -// +void wxMacDataItemBrowserControl::MacInsert( unsigned int n, + const wxArrayStringsAdapter& items, + int column ) +{ + size_t itemsCount = items.GetCount(); + if ( itemsCount == 0 ) + return; -#ifdef __WXMAC_OSX__ -// snippets from Sketch Sample from Apple : + SInt32 frontLineOrder = 0; -#define kGenericRGBProfilePathStr "/System/Library/ColorSync/Profiles/Generic RGB Profile.icc" + 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(); + } + } -/* - 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() + 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 { - static CMProfileRef cachedRGBProfileRef = NULL; + wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n); + return IsItemSelected( item ); +} + +int wxMacDataItemBrowserControl::MacGetSelection() const +{ + wxMacDataItemPtr first, last; + GetSelectionAnchor( &first, &last ); - // we only create the profile reference once - if (cachedRGBProfileRef == NULL) + if ( first != NULL ) { - CMProfileLocation loc; + return GetLineFromItem( first ); + } + + return -1; +} + +int wxMacDataItemBrowserControl::MacGetSelections( wxArrayInt& aSelections ) const +{ + aSelections.Empty(); + wxArrayMacDataItemPtr selectedItems; + GetItems( wxMacDataBrowserRootContainer, false , kDataBrowserItemIsSelected, selectedItems); - loc.locType = cmPathBasedProfile; - strcpy(loc.u.pathLoc.path, kGenericRGBProfilePathStr); + int count = selectedItems.GetCount(); - verify_noerr( CMOpenProfile(&cachedRGBProfileRef, &loc) ); + for ( int i = 0; i < count; ++i) + { + aSelections.Add(GetLineFromItem(selectedItems[i])); } - // clone the profile reference so that the caller has their own reference, not our cached one - if (cachedRGBProfileRef) - CMCloneProfileRef(cachedRGBProfileRef); + 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 ) +{ + UInt32 top , left ; + GetScrollPosition( &top , &left ) ; + wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n ); + + // there is a bug in RevealItem that leads to situations + // in large lists, where the item does not get scrolled + // into sight, so we do a pre-scroll if necessary + UInt16 height ; + GetRowHeight( (DataBrowserItemID) item , &height ) ; + UInt32 linetop = n * ((UInt32) height ); + UInt32 linebottom = linetop + height; + Rect rect ; + GetRect( &rect ); + + if ( linetop < top || linebottom > (top + rect.bottom - rect.top ) ) + SetScrollPosition( wxMax( n-2, 0 ) * ((UInt32)height) , left ) ; + + RevealItem( item , kDataBrowserRevealWithoutSelecting ); +} + + + +// +// Tab Control +// - return cachedRGBProfileRef; +OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable ) +{ + return ::SetTabEnabled( m_controlRef , tabNo , enable ); } +#endif + +// +// Quartz Support +// + /* 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 @@ -2102,43 +1947,55 @@ CMProfileRef wxMacOpenGenericProfile() CGColorSpaceRef wxMacGetGenericRGBColorSpace() { - static wxMacCFRefHolder genericRGBColorSpace; + static wxCFRef genericRGBColorSpace; if (genericRGBColorSpace == NULL) { - if ( UMAGetSystemVersion() >= 0x1040 ) - { - genericRGBColorSpace.Set( CGColorSpaceCreateWithName( CFSTR("kCGColorSpaceGenericRGB") ) ); - } - else - { - CMProfileRef genericRGBProfile = wxMacOpenGenericProfile(); + genericRGBColorSpace.reset( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) ); + } - if (genericRGBProfile) - { - genericRGBColorSpace.Set( CGColorSpaceCreateWithPlatformColorSpace(genericRGBProfile) ); + return genericRGBColorSpace; +} - wxASSERT_MSG( genericRGBColorSpace != NULL, wxT("couldn't create the generic RGB color space") ); +CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush ) +{ + CGColorRef color ; + HIThemeBrushCreateCGColor( brush, &color ); + return color; +} - // we opened the profile so it is up to us to close it - CMCloseProfile(genericRGBProfile); - } - } - } +#if wxMAC_USE_QUICKDRAW - return genericRGBColorSpace; +static inline void PointFromHIPoint(const HIPoint& p, Point *pt) +{ + pt->h = wx_static_cast(short, p.x); + pt->v = wx_static_cast(short, p.y); } -#endif -wxMacPortSaver::wxMacPortSaver( GrafPtr port ) +void wxMacGlobalToLocal( WindowRef window , Point*pt ) { - ::GetPort( &m_port ); - ::SetPort( port ); + HIPoint p = CGPointMake( pt->h, pt->v ); + HIViewRef contentView ; + // TODO check toolbar offset + HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ; + HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView ); + PointFromHIPoint(p, pt); } -wxMacPortSaver::~wxMacPortSaver() +void wxMacLocalToGlobal( WindowRef window , Point*pt ) { - ::SetPort( m_port ); + HIPoint p = CGPointMake( pt->h, pt->v ); + HIViewRef contentView ; + // TODO check toolbar offset + HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ; + HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL ); + PointFromHIPoint(p, pt); } +#endif // wxMAC_USE_QUICKDRAW + #endif // wxUSE_GUI + +#if wxUSE_BASE + +#endif