// 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 <ctype.h>
#endif
#endif
-// ---------------------------------------------------------------------------
-// code used in both base and GUI compilation
-// ---------------------------------------------------------------------------
+#if wxUSE_BASE
// our OS version is the same in non GUI and GUI cases
-static int DoGetOSVersion(int *majorVsn, int *minorVsn)
+wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
{
long theSystem;
-
- // are there x-platform conventions ?
-
Gestalt(gestaltSystemVersion, &theSystem);
- if (minorVsn != NULL)
- *minorVsn = (theSystem & 0xFF);
- if (majorVsn != NULL)
+ if ( majorVsn != NULL )
*majorVsn = (theSystem >> 8);
-#ifdef __DARWIN__
- return wxMAC_DARWIN;
+ if ( minorVsn != NULL )
+ *minorVsn = (theSystem & 0xFF);
+
+#if defined( __DARWIN__ )
+ return wxOS_MAC_OSX_DARWIN;
#else
- return wxMAC;
+ return wxOS_MAC_OS;
#endif
}
-
-#if wxUSE_BASE
-
// ----------------------------------------------------------------------------
// debugging support
// ----------------------------------------------------------------------------
kMetroNubUserAPIVersion <= block->apiHiVersion)
{
// success!
- gMetroNubEntry = block;
+ gMetroNubEntry = block;
}
}
}
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()
{
SysBeep(30);
}
-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 ( err == noErr )
{
-
+
if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
return;
s_wakeupEvent.SetCurrentTime();
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;
}
{
Init();
m_peer = peer;
- m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing();
m_controlRef = (ControlRef) control;
}
m_peer = NULL;
m_controlRef = NULL;
m_needsFocusRect = false;
- m_isCompositing = false;
m_isRootControl = false;
}
void wxMacControl::Dispose()
{
+ 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 );
m_controlRef = NULL;
}
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 )
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;
+ HIPoint hiPoint;
- pt->x = pt->x + fromRect.left - toRect.left;
- pt->y = pt->y + fromRect.top - toRect.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;
}
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;
-
- // 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 );
- }
-
- SetControlBounds( m_controlRef , &controlBounds );
- if ( vis )
- InvalWindowRect( GetControlOwner( m_controlRef ) , &controlBounds );
- }
}
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 )
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;
}
{
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;
Boolean changeValue )
{
OSStatus err = errDataBrowserPropertyNotSupported;
-
wxMacDataBrowserControl* ctl = dynamic_cast<wxMacDataBrowserControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
if ( ctl != 0 )
{
}
pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc(
- ControlRef browser,
- DataBrowserItemID itemOneID,
- DataBrowserItemID itemTwoID,
- DataBrowserPropertyID sortProperty)
+ ControlRef browser,
+ DataBrowserItemID itemOneID,
+ DataBrowserItemID itemTwoID,
+ DataBrowserPropertyID sortProperty)
{
wxMacDataBrowserControl* ctl = dynamic_cast<wxMacDataBrowserControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
if ( ctl != 0 )
DataBrowserItemCompareUPP gDataBrowserItemCompareUPP = NULL;
wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style) : wxMacControl( peer )
-{
+{
Rect bounds = wxMacGetBoundsForControl( peer, pos, size );
OSStatus err = ::CreateDataBrowserControl(
MAC_WXHWND(peer->MacGetTopLevelWindowRef()),
OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container,
Boolean recurse,
DataBrowserItemState state,
- UInt32 *numItems) const
+ UInt32 *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 )
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);
return SetDataBrowserCallbacks( m_controlRef, callbacks );
}
-OSStatus wxMacDataBrowserControl::UpdateItems(
+OSStatus wxMacDataBrowserControl::UpdateItems(
DataBrowserItemID container,
UInt32 numItems,
const DataBrowserItemID *items,
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,
+OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column,
UInt32 *position) const
{
return GetDataBrowserTableViewColumnPosition( m_controlRef , column , position);
}
-OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, UInt32 position)
+OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, UInt32 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()
-{
+wxMacDataItem::~wxMacDataItem()
+{
}
-
-bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner ,
- const wxMacDataItem*,
- DataBrowserPropertyID property) const
+
+void wxMacDataItem::SetOrder( SInt32 order )
{
- return false;
+ m_order = order;
+}
+
+SInt32 wxMacDataItem::GetOrder() const
+{
+ return m_order;
+}
+
+void wxMacDataItem::SetData( void* data)
+{
+ m_data = data;
+}
+
+void* wxMacDataItem::GetData() const
+{
+ return m_data;
+}
+
+short wxMacDataItem::GetColumn()
+{
+ return m_colId;
+}
+
+void wxMacDataItem::SetColumn( short col )
+{
+ m_colId = col;
+}
+
+void wxMacDataItem::SetLabel( const wxString& str)
+{
+ m_label = str;
+ m_cfLabel.Assign( str , wxLocale::GetSystemEncoding());
+}
+
+const wxString& wxMacDataItem::GetLabel() const
+{
+ return m_label;
+}
+
+bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner ,
+ const wxMacDataItem* rhs,
+ DataBrowserPropertyID sortProperty) const
+{
+ const wxMacDataItem* otherItem = dynamic_cast<const wxMacDataItem*>(rhs);
+ bool retval = false;
+
+ if ( sortProperty == m_colId ){
+ retval = m_label.CmpNoCase( otherItem->m_label) < 0;
+ }
+
+ else if ( sortProperty == kNumericOrderColumnId )
+ retval = m_order < otherItem->m_order;
+
+ return retval;
}
-OSStatus wxMacDataItem::GetSetData(wxMacDataItemBrowserControl *owner ,
+OSStatus wxMacDataItem::GetSetData( wxMacDataItemBrowserControl *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 ,
+void wxMacDataItem::Notification(wxMacDataItemBrowserControl *owner ,
DataBrowserItemNotification message,
DataBrowserItemDataRef itemData ) const
{
}
-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;
}
-
-wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser)
+
+wxMacDataItem* wxMacDataItemBrowserControl::CreateItem()
+{
+ return new wxMacDataItem();
+}
+
+wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser)
{
m_former = browser->SuppressSelection(true);
m_browser = browser;
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 )
DataBrowserItemID itemID,
DataBrowserPropertyID property,
DataBrowserItemDataRef itemData,
- Boolean changeValue )
+ Boolean changeValue )
{
wxMacDataItem* item = (wxMacDataItem*) itemID;
return GetSetItemData(item, property, itemData , changeValue );
wxMacDataItem* item,
DataBrowserPropertyID property,
DataBrowserItemDataRef itemData,
- Boolean changeValue )
+ Boolean changeValue )
{
OSStatus err = errDataBrowserPropertyNotSupported;
switch( property )
// right now default behaviour on these
break;
default :
- if ( item != NULL )
+
+ if ( item != NULL ){
err = item->GetSetData( this, property , itemData , changeValue );
+ }
break;
-
+
}
return err;
}
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 ) );
+ 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 );
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();
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();
+ wxMacCFStringHolder cfTitle;
+ cfTitle.Assign( title, enc );
+ columnDesc.headerBtnDesc.titleString = cfTitle;
+
+ columnDesc.headerBtnDesc.minimumWidth = 0;
+ columnDesc.headerBtnDesc.maximumWidth = 30000;
+
+ columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
+ columnDesc.propertyDesc.propertyType = colType;
+ columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewDefaultColumnFlags | kDataBrowserListViewTypeSelectColumn;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
+#endif
+
+ verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+
+ if (defaultWidth > 0){
+ SetColumnWidth(colId, defaultWidth);
+ }
+
+}
+
+void wxMacDataItemBrowserControl::SetColumnWidth(int colId, int width)
+{
+ DataBrowserPropertyID id;
+ GetColumnIDFromIndex(colId, &id);
+ verify_noerr( wxMacDataBrowserControl::SetColumnWidth(id, width));
+}
+
+int wxMacDataItemBrowserControl::GetColumnWidth(int colId)
+{
+ DataBrowserPropertyID id;
+ GetColumnIDFromIndex(colId, &id);
+ UInt16 result;
+ verify_noerr( wxMacDataBrowserControl::GetColumnWidth(id, &result));
+ return result;
+}
+
void wxMacDataItemBrowserControl::AddItem(wxMacDataItem *container, wxMacDataItem *item)
{
- verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, 1,
+ 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,
+ OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1,
(UInt32*) &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,
+ OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems,
(UInt32*) 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];
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;
+}
+
+unsigned int wxMacDataItemBrowserControl::MacGetCount() const
+{
+ return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState);
+}
+
+void wxMacDataItemBrowserControl::MacDelete( unsigned int n )
+{
+ wxMacDataItem* item = (wxMacDataItem*)GetItemFromLine( n );
+ RemoveItem( wxMacDataBrowserRootContainer, item );
+}
+
+void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxString& text, int column )
+{
+ wxMacDataItem* newItem = CreateItem();
+ newItem->SetLabel( text );
+ if ( column != -1 )
+ newItem->SetColumn( kMinColumnId + column );
+
+ if ( m_sortOrder == SortOrder_None )
+ {
+ // increase the order of the lines to be shifted
+ unsigned int lines = MacGetCount();
+ for ( unsigned int i = n; i < lines; ++i)
+ {
+ wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
+ iter->SetOrder( iter->GetOrder() + 1 );
+ }
+
+ SInt32 frontLineOrder = 0;
+ if ( n > 0 )
+ {
+ wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
+ frontLineOrder = iter->GetOrder();
+ }
+ newItem->SetOrder( frontLineOrder + 1 );
+ }
+
+ AddItem( wxMacDataBrowserRootContainer, newItem );
+}
+
+void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxArrayString& items, int column )
+{
+ size_t itemsCount = items.GetCount();
+ if ( itemsCount == 0 )
+ return;
+
+ SInt32 frontLineOrder = 0;
+
+ if ( m_sortOrder == SortOrder_None )
+ {
+ // increase the order of the lines to be shifted
+ unsigned int lines = MacGetCount();
+ for ( unsigned int i = n; i < lines; ++i)
+ {
+ wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
+ iter->SetOrder( iter->GetOrder() + itemsCount );
+ }
+ if ( n > 0 )
+ {
+ wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
+ frontLineOrder = iter->GetOrder();
+ }
+ }
+
+ wxArrayMacDataItemPtr ids;
+ ids.SetCount( itemsCount );
+
+ for ( unsigned int i = 0; i < itemsCount; ++i )
+ {
+ wxMacDataItem* item = CreateItem();
+ item->SetLabel( items[i]);
+ if ( column != -1 )
+ item->SetColumn( kMinColumnId + column );
+
+ if ( m_sortOrder == SortOrder_None )
+ item->SetOrder( frontLineOrder + 1 + i );
+
+ ids[i] = item;
+ }
+
+ AddItems( wxMacDataBrowserRootContainer, ids );
+}
+
+int wxMacDataItemBrowserControl::MacAppend( const wxString& text)
+{
+ wxMacDataItem* item = CreateItem();
+ item->SetLabel( text );
+ if ( m_sortOrder == SortOrder_None )
+ {
+ unsigned int lines = MacGetCount();
+ if ( lines == 0 )
+ item->SetOrder( 1 );
+ else
+ {
+ wxMacDataItem* frontItem = (wxMacDataItem*) GetItemFromLine(lines-1);
+ item->SetOrder( frontItem->GetOrder() + 1 );
+ }
+ }
+ AddItem( wxMacDataBrowserRootContainer, item );
+
+ return GetLineFromItem(item);
+}
+
+void wxMacDataItemBrowserControl::MacClear()
+{
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+ RemoveAllItems(wxMacDataBrowserRootContainer);
+}
+
+void wxMacDataItemBrowserControl::MacDeselectAll()
+{
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+ SetSelectedAllItems( kDataBrowserItemsRemove );
+}
+
+void wxMacDataItemBrowserControl::MacSetSelection( unsigned int n, bool select, bool multi )
+{
+ wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n);
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+
+ if ( IsItemSelected( item ) != select )
+ {
+ if ( select )
+ SetSelectedItem( item, multi ? kDataBrowserItemsAdd : kDataBrowserItemsAssign );
+ else
+ SetSelectedItem( item, kDataBrowserItemsRemove );
+ }
+
+ MacScrollTo( n );
+}
+
+bool wxMacDataItemBrowserControl::MacIsSelected( unsigned int n ) const
+{
+ wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n);
+ return IsItemSelected( item );
+}
+
+int wxMacDataItemBrowserControl::MacGetSelection() const
+{
+ wxMacDataItemPtr first, last;
+ GetSelectionAnchor( &first, &last );
+
+ if ( first != NULL )
+ {
+ return GetLineFromItem( first );
+ }
+
+ return -1;
+}
+
+int wxMacDataItemBrowserControl::MacGetSelections( wxArrayInt& aSelections ) const
+{
+ aSelections.Empty();
+ wxArrayMacDataItemPtr selectedItems;
+ GetItems( wxMacDataBrowserRootContainer, false , kDataBrowserItemIsSelected, selectedItems);
+
+ int count = selectedItems.GetCount();
+
+ for ( int i = 0; i < count; ++i)
+ {
+ aSelections.Add(GetLineFromItem(selectedItems[i]));
+ }
+
+ return count;
+}
+
+void wxMacDataItemBrowserControl::MacSetString( unsigned int n, const wxString& text )
+{
+ // as we don't store the strings we only have to issue a redraw
+ wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine( n);
+ item->SetLabel( text );
+ UpdateItem( wxMacDataBrowserRootContainer, item , kTextColumnId );
+}
+
+wxString wxMacDataItemBrowserControl::MacGetString( unsigned int n ) const
+{
+ wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
+ return item->GetLabel();
+}
+
+void wxMacDataItemBrowserControl::MacSetClientData( unsigned int n, void * data)
+{
+ wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine( n);
+ item->SetData( data );
+ // not displayed, therefore no Update infos to DataBrowser
+}
+
+void * wxMacDataItemBrowserControl::MacGetClientData( unsigned int n) const
+{
+ wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
+ return item->GetData();
+}
+
+void wxMacDataItemBrowserControl::MacScrollTo( unsigned int n )
+{
+ RevealItem( GetItemFromLine( n) , kDataBrowserRevealWithoutSelecting );
+}
+
+
//
// Tab Control
wxASSERT_MSG( genericRGBColorSpace != NULL, wxT("couldn't create the generic RGB color space") );
// we opened the profile so it is up to us to close it
- CMCloseProfile(genericRGBProfile);
+ CMCloseProfile(genericRGBProfile);
}
}
}
projects / wxWidgets.git / blobdiff