X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e4124e75398c63ed70d1183b4ab1a3496423a71..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/utils.cpp?ds=inline diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 6f92c8713d..e302a68cdd 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -35,34 +35,23 @@ #include #include -#include "MoreFilesX.h" +// #include "MoreFilesX.h" -#ifndef __DARWIN__ - #include - #include +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + #include #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 @@ -72,7 +61,7 @@ // our OS version is the same in non GUI and GUI cases wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn) { - long theSystem; + SInt32 theSystem; Gestalt(gestaltSystemVersion, &theSystem); if ( majorVsn != NULL ) @@ -88,279 +77,26 @@ wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn) #endif } -// ---------------------------------------------------------------------------- -// 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 TARGET_API_MAC_CARBON - return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL); -#else - return (gMetroNubEntry != NULL); -#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) +// Emit a beeeeeep +void wxBell() { - // 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) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( AudioServicesPlayAlertSound ) + AudioServicesPlayAlertSound(kUserPreferredAlert); + else +#endif +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 + SysBeep(30); +#else { - 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; -} - -// 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() -{ - SysBeep(30); } @@ -376,83 +112,15 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const 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) -{ - // 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) +wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() { - wxString buf; - buf.Printf(wxT("%ld"), value); - - return wxWriteResource(section, entry, buf, file); -} - -bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file) -{ - 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; + 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 succ; + return new wxCarbonTimerImpl(timer); } -#endif // wxUSE_RESOURCES int gs_wxBusyCursorCount = 0; extern wxCursor gMacCurrentCursor; @@ -465,6 +133,8 @@ void wxBeginBusyCursor(const wxCursor *cursor) { gMacStoredActiveCursor = gMacCurrentCursor; cursor->MacInstall(); + + wxSetCursor(*cursor); } //else: nothing to do, already set } @@ -479,6 +149,8 @@ void wxEndBusyCursor() { gMacStoredActiveCursor.MacInstall(); gMacStoredActiveCursor = wxNullCursor; + + wxSetCursor(wxNullCursor); } } @@ -520,7 +192,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; @@ -528,12 +200,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 @@ -545,29 +219,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) @@ -585,8 +261,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; @@ -596,6 +298,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) @@ -607,21 +310,24 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) #if wxUSE_BASE +#include + wxString wxGetOsDescription() { -#ifdef WXWIN_OS_DESCRIPTION - // use configure generated description if available - return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")")); -#else - return wxT("MacOS"); //TODO:define further -#endif + char data[128]; + struct utsname name; + uname(&name); + return wxString::Format(_T("Mac OS X (%s %s %s)"), + wxString::FromAscii(name.sysname).c_str(), + wxString::FromAscii(name.release).c_str(), + wxString::FromAscii(name.machine).c_str()); } #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) @@ -689,52 +395,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 @@ -791,6 +479,15 @@ 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(); @@ -826,16 +523,18 @@ void wxMacControl::Init() void wxMacControl::Dispose() { + 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") ); - CFIndex count = CFGetRetainCount( m_controlRef ) ; - wxASSERT_MSG( count == 1 , wxT("Reference Count of native control was not 1 in Dispose") ); - - ::DisposeControl( m_controlRef ); + // 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 ); } @@ -857,13 +556,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 ) @@ -952,7 +646,7 @@ bool wxMacControl::NeedsFocusRect() const return m_needsFocusRect; } -void wxMacControl::VisibilityChanged(bool shown) +void wxMacControl::VisibilityChanged(bool WXUNUSED(shown)) { } @@ -963,6 +657,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 ) { @@ -1008,17 +725,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 ) @@ -1029,7 +746,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 ) @@ -1059,11 +780,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 @@ -1141,7 +858,18 @@ void wxMacControl::GetRect( Rect *r ) 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 ) @@ -1160,7 +888,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 ) @@ -1176,15 +904,10 @@ OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region ) 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 ) { @@ -1207,13 +930,10 @@ 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 ) @@ -1237,7 +957,7 @@ void wxMacControl::SetReferenceInNativeControl() wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) { wxMacControl* ctl = NULL; - UInt32 actualSize; + ByteCount actualSize; if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) , &actualSize , &ctl ) == noErr ) { @@ -1253,13 +973,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); @@ -1274,7 +996,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); @@ -1288,7 +1010,7 @@ pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc( 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); @@ -1300,7 +1022,11 @@ 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( @@ -1315,11 +1041,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; @@ -1335,7 +1057,7 @@ 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 ); } @@ -1360,12 +1082,12 @@ OSStatus wxMacDataBrowserControl::AddColumn( DataBrowserListViewColumnDesc *colu } OSStatus wxMacDataBrowserControl::GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id ){ - return GetDataBrowserTableViewColumnProperty( m_controlRef, position, id ); + return GetDataBrowserTableViewColumnProperty( m_controlRef, position, id ); } OSStatus wxMacDataBrowserControl::RemoveColumn( DataBrowserTableViewColumnIndex position ) { - DataBrowserTableViewColumnID id; + DataBrowserTableViewColumnID id; GetColumnIDFromIndex( position, &id ); return RemoveDataBrowserTableViewColumn( m_controlRef, id ); } @@ -1510,12 +1232,12 @@ OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const } OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column, - UInt32 *position) const + 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); } @@ -1590,6 +1312,7 @@ OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID pro wxMacDataItem::wxMacDataItem() { m_data = NULL; + m_order = 0; m_colId = kTextColumnId; // for compat with existing wx*ListBox impls. } @@ -1626,12 +1349,12 @@ short wxMacDataItem::GetColumn() void wxMacDataItem::SetColumn( short col ) { m_colId = col; -} +} void wxMacDataItem::SetLabel( const wxString& str) { m_label = str; - m_cfLabel.Assign( str , wxLocale::GetSystemEncoding()); + m_cfLabel = wxCFStringRef( str , wxLocale::GetSystemEncoding()); } const wxString& wxMacDataItem::GetLabel() const @@ -1639,24 +1362,24 @@ const wxString& wxMacDataItem::GetLabel() const return m_label; } -bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner , +bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *WXUNUSED(owner) , const wxMacDataItem* rhs, DataBrowserPropertyID sortProperty) const { - const wxMacDataItem* otherItem = dynamic_cast(rhs); + const wxMacDataItem* otherItem = wx_const_cast(wxMacDataItem*,rhs); bool retval = false; - - if ( sortProperty == m_colId && owner->GetSortOrder() != SortOrder_None){ + + if ( sortProperty == m_colId ){ retval = m_label.CmpNoCase( otherItem->m_label) < 0; } - - else if ( owner->GetSortOrder() == SortOrder_None || sortProperty == kNumericOrderColumnId ) + + else if ( sortProperty == kNumericOrderColumnId ) retval = m_order < otherItem->m_order; return retval; } -OSStatus wxMacDataItem::GetSetData( wxMacDataItemBrowserControl *owner , +OSStatus wxMacDataItem::GetSetData( wxMacDataItemBrowserControl *WXUNUSED(owner) , DataBrowserPropertyID property, DataBrowserItemDataRef itemData, bool changeValue ) @@ -1688,12 +1411,13 @@ OSStatus wxMacDataItem::GetSetData( wxMacDataItemBrowserControl *owner , 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) : wxMacDataBrowserControl( peer, pos, size, style ) @@ -1703,16 +1427,6 @@ wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const m_clientDataItemsType = wxClientData_None; } -ListSortOrder wxMacDataItemBrowserControl::GetSortOrder() const -{ - return m_sortOrder; -} - -void wxMacDataItemBrowserControl::SetSortOrder(const ListSortOrder sort) -{ - m_sortOrder = sort; -} - wxMacDataItem* wxMacDataItemBrowserControl::CreateItem() { return new wxMacDataItem(); @@ -1781,7 +1495,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( // right now default behaviour on these break; default : - + if ( item != NULL ){ err = item->GetSetData( this, property , itemData , changeValue ); } @@ -1812,13 +1526,13 @@ void wxMacDataItemBrowserControl::ItemNotification( unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container, bool recurse , DataBrowserItemState state) const { - UInt32 numItems = 0; + ItemCount numItems = 0; verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container, recurse, state, &numItems ) ); return numItems; } -unsigned int wxMacDataItemBrowserControl::GetSelectedItemCount( const wxMacDataItem* container, +unsigned int wxMacDataItemBrowserControl::GetSelectedItemCount( const wxMacDataItem* container, bool recurse ) const { return GetItemCount( container, recurse, kDataBrowserItemIsSelected ); @@ -1879,7 +1593,7 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, delete [] items; } -void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType, DataBrowserPropertyFlags flags , +void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType, const wxString& title, SInt16 just, int defaultWidth) { DataBrowserListViewColumnDesc columnDesc; @@ -1889,11 +1603,11 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp columnDesc.headerBtnDesc.btnFontStyle.flags = kControlUseFontMask | kControlUseJustMask; - columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlContentTextOnly; + 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; @@ -1901,19 +1615,17 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp enc = m_font.GetEncoding(); else enc = wxLocale::GetSystemEncoding(); - wxMacCFStringHolder cfTitle; - cfTitle.Assign( title, enc ); - columnDesc.headerBtnDesc.titleString = cfTitle; + 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 = flags; -#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 + columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn; columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn; -#endif + columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton; verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) ); @@ -1960,7 +1672,7 @@ void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacD void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item) { OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1, - (UInt32*) &item, kDataBrowserItemNoProperty ); + (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ); verify_noerr( err ); } @@ -1972,7 +1684,7 @@ void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayM items[i] = (DataBrowserItemID) itemArray[i]; OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems, - (UInt32*) items, kDataBrowserItemNoProperty ); + (DataBrowserItemID*) items, kDataBrowserItemNoProperty ); verify_noerr( err ); delete [] items; } @@ -2039,36 +1751,9 @@ void wxMacDataItemBrowserControl::MacDelete( unsigned int 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 ) +void wxMacDataItemBrowserControl::MacInsert( unsigned int n, + const wxArrayStringsAdapter& items, + int column ) { size_t itemsCount = items.GetCount(); if ( itemsCount == 0 ) @@ -2101,7 +1786,7 @@ void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxArrayString item->SetLabel( items[i]); if ( column != -1 ) item->SetColumn( kMinColumnId + column ); - + if ( m_sortOrder == SortOrder_None ) item->SetOrder( frontLineOrder + 1 + i ); @@ -2223,7 +1908,24 @@ void * wxMacDataItemBrowserControl::MacGetClientData( unsigned int n) const void wxMacDataItemBrowserControl::MacScrollTo( unsigned int n ) { - RevealItem( GetItemFromLine( n) , kDataBrowserRevealWithoutSelecting ); + 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 ); } @@ -2237,42 +1939,12 @@ OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable ) return ::SetTabEnabled( m_controlRef , tabNo , enable ); } +#endif + // // 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 @@ -2285,43 +1957,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