// 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 )
// Emit a beeeeeep
void wxBell()
{
+#ifndef __LP64__
SysBeep(30);
+#endif
}
void wxGetMousePosition( int* x, int* y )
{
Point pt;
-
+#if wxMAC_USE_CORE_GRAPHICS
+ GetGlobalMouse(&pt);
+#else
GetMouse( &pt );
LocalToGlobal( &pt );
+#endif
*x = pt.h;
*y = pt.v;
};
// Returns depth of screen
int wxDisplayDepth()
{
+ int theDepth = 8;
+#if wxMAC_USE_CORE_GRAPHICS
+ theDepth = (int) CGDisplayBitsPerPixel(CGMainDisplayID());
+#else
Rect globRect;
SetRect(&globRect, -32760, -32760, 32760, 32760);
GDHandle theMaxDevice;
- int theDepth = 8;
theMaxDevice = GetMaxDevice(&globRect);
if (theMaxDevice != NULL)
theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
-
+#endif
return theDepth;
}
// Get size of display
void wxDisplaySize(int *width, int *height)
{
+#if wxMAC_USE_CORE_GRAPHICS
+ // TODO adapt for multi-displays
+ CGRect bounds = CGDisplayBounds(CGMainDisplayID());
+ if ( width )
+ *width = (int)bounds.size.width ;
+ if ( height )
+ *height = (int)bounds.size.height;
+#else
BitMap screenBits;
GetQDGlobalsScreenBits( &screenBits );
if (height != NULL)
*height = screenBits.bounds.bottom - screenBits.bounds.top;
+#endif
}
void wxDisplaySizeMM(int *width, int *height)
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+ HIRect bounds ;
+ HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal,
+ &bounds);
+ if ( x )
+ *x = bounds.origin.x;
+ if ( y )
+ *y = bounds.origin.y;
+ if ( width )
+ *width = bounds.size.width;
+ if ( height )
+ *height = bounds.size.height;
+#else
Rect r;
-
GetAvailableWindowPositioningBounds( GetMainDevice() , &r );
if ( x )
*x = r.left;
*width = r.right - r.left;
if ( height )
*height = r.bottom - r.top;
+#endif
}
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
// Control Access Support
// ----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject )
+
+wxMacControl::wxMacControl()
+{
+ Init();
+}
+
wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl )
{
Init();
{
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
+ CFRelease(m_controlRef);
m_controlRef = NULL;
}
-void wxMacControl::SetReference( SInt32 data )
+void wxMacControl::SetReference( URefCon data )
{
SetControlReference( m_controlRef , data );
}
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 )
wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control)
{
wxMacControl* ctl = NULL;
- UInt32 actualSize;
+ ByteCount actualSize;
if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) ,
&actualSize , &ctl ) == noErr )
{
// basing on DataBrowserItemIDs
//
+IMPLEMENT_ABSTRACT_CLASS( wxMacDataBrowserControl , wxMacControl )
+
pascal void wxMacDataBrowserControl::DataBrowserItemNotificationProc(
ControlRef browser,
DataBrowserItemID itemID,
DataBrowserItemNotification message,
DataBrowserItemDataRef itemData )
{
- wxMacDataBrowserControl* ctl = dynamic_cast<wxMacDataBrowserControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+ wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
if ( ctl != 0 )
{
ctl->ItemNotification(itemID, message, itemData);
Boolean changeValue )
{
OSStatus err = errDataBrowserPropertyNotSupported;
- wxMacDataBrowserControl* ctl = dynamic_cast<wxMacDataBrowserControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+ wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
if ( ctl != 0 )
{
err = ctl->GetSetItemData(itemID, property, itemData, changeValue);
DataBrowserItemID itemTwoID,
DataBrowserPropertyID sortProperty)
{
- wxMacDataBrowserControl* ctl = dynamic_cast<wxMacDataBrowserControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+ wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
if ( ctl != 0 )
{
return ctl->CompareItems(itemOneID, itemTwoID, sortProperty);
OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container,
Boolean recurse,
DataBrowserItemState state,
- UInt32 *numItems) const
+ ItemCount *numItems) const
{
return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems );
}
}
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 );
}
}
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);
}
wxMacDataItem::wxMacDataItem()
{
m_data = NULL;
+
m_order = 0;
m_colId = kTextColumnId; // for compat with existing wx*ListBox impls.
}
void wxMacDataItem::SetColumn( short col )
{
m_colId = col;
-}
+}
void wxMacDataItem::SetLabel( const wxString& str)
{
const wxMacDataItem* rhs,
DataBrowserPropertyID sortProperty) const
{
- const wxMacDataItem* otherItem = dynamic_cast<const wxMacDataItem*>(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;
{
}
+IMPLEMENT_DYNAMIC_CLASS( wxMacDataItemBrowserControl , wxMacDataBrowserControl )
wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) :
wxMacDataBrowserControl( peer, pos, size, style )
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();
// right now default behaviour on these
break;
default :
-
+
if ( item != NULL ){
err = item->GetSetData( this, property , itemData , changeValue );
}
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 );
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;
enc = wxLocale::GetSystemEncoding();
wxMacCFStringHolder cfTitle;
cfTitle.Assign( title, enc );
- columnDesc.headerBtnDesc.titleString = cfTitle;
+ columnDesc.headerBtnDesc.titleString = cfTitle;
columnDesc.headerBtnDesc.minimumWidth = 0;
columnDesc.headerBtnDesc.maximumWidth = 30000;
columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
columnDesc.propertyDesc.propertyType = colType;
- columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewDefaultColumnFlags | kDataBrowserListViewTypeSelectColumn;;
+ columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn;
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+#endif
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewNoGapForIconInHeaderButton;
+ columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
#endif
verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item)
{
OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1,
- (UInt32*) &item, kDataBrowserItemNoProperty );
+ (DataBrowserItemID*) &item, kDataBrowserItemNoProperty );
verify_noerr( err );
}
items[i] = (DataBrowserItemID) itemArray[i];
OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems,
- (UInt32*) items, kDataBrowserItemNoProperty );
+ (DataBrowserItemID*) items, kDataBrowserItemNoProperty );
verify_noerr( err );
delete [] items;
}
item->SetLabel( items[i]);
if ( column != -1 )
item->SetColumn( kMinColumnId + column );
-
+
if ( m_sortOrder == SortOrder_None )
item->SetOrder( frontLineOrder + 1 + i );
}
#endif
+#ifndef __LP64__
+
wxMacPortSaver::wxMacPortSaver( GrafPtr port )
{
::GetPort( &m_port );
{
::SetPort( m_port );
}
+#endif
+
+void wxMacGlobalToLocal( WindowRef window , Point*pt )
+{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+ HIPoint p = CGPointMake( pt->h, pt->v );
+ HIViewRef contentView ;
+ // TODO check toolbar offset
+ HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+ HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
+ pt->h = p.x;
+ pt->v = p.y;
+#else
+ QDGlobalToLocalPoint( GetWindowPort(window), pt ) ;
+#endif
+}
+
+void wxMacLocalToGlobal( WindowRef window , Point*pt )
+{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+ HIPoint p = CGPointMake( pt->h, pt->v );
+ HIViewRef contentView ;
+ // TODO check toolbar offset
+ HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+ HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
+ pt->h = p.x;
+ pt->v = p.y;
+#else
+ QDLocalToGlobalPoint( GetWindowPort(window), pt ) ;
+#endif
+}
#endif // wxUSE_GUI
projects / wxWidgets.git / blobdiff