#if wxUSE_LISTBOX
#include "wx/listbox.h"
+#include "wx/dnd.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
wxListWidgetCocoaImpl* impl;
}
-- (id)tableView:(NSTableView *)aTableView
- objectValueForTableColumn:(NSTableColumn *)aTableColumn
+- (id)tableView:(NSTableView *)aTableView
+ objectValueForTableColumn:(NSTableColumn *)aTableColumn
row:(NSInteger)rowIndex;
-- (id)tableView:(NSTableView *)aTableView
- setObjectValue:(NSTableColumn *)aTableColumn
+- (void)tableView:(NSTableView *)aTableView
+ setObjectValue:(id)value forTableColumn:(NSTableColumn *)aTableColumn
row:(NSInteger)rowIndex;
-
+
- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
- (void)setImplementation: (wxListWidgetCocoaImpl *) theImplementation;
@interface wxNSTableView : NSTableView
{
- wxListWidgetCocoaImpl* impl;
}
-- (void)setImplementation: (wxListWidgetCocoaImpl *) theImplementation;
-- (wxListWidgetCocoaImpl*) implementation;
-
@end
//
class WXDLLIMPEXP_CORE wxCocoaTableColumn : public wxListWidgetColumn
{
public :
- wxCocoaTableColumn( wxNSTableColumn* column, bool editable )
+ wxCocoaTableColumn( wxNSTableColumn* column, bool editable )
: m_column( column ), m_editable(editable)
{
}
-
+
~wxCocoaTableColumn()
{
}
-
+
wxNSTableColumn* GetNSTableColumn() const { return m_column ; }
-
+
bool IsEditable() const { return m_editable; }
-
+
protected :
wxNSTableColumn* m_column;
bool m_editable;
{
public :
wxListWidgetCocoaImpl( wxWindowMac* peer, NSScrollView* view, wxNSTableView* tableview, wxNSTableDataSource* data );
-
+
~wxListWidgetCocoaImpl();
-
- virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,
+
+ virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
- virtual wxListWidgetColumn* InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,
+ virtual wxListWidgetColumn* InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
-
+
// add and remove
-
- virtual void ListDelete( unsigned int n ) ;
+
+ virtual void ListDelete( unsigned int n ) ;
virtual void ListInsert( unsigned int n ) ;
virtual void ListClear() ;
// selecting
virtual void ListDeselectAll();
-
+
virtual void ListSetSelection( unsigned int n, bool select, bool multi ) ;
virtual int ListGetSelection() const ;
-
+
virtual int ListGetSelections( wxArrayInt& aSelections ) const ;
-
+
virtual bool ListIsSelected( unsigned int n ) const ;
-
+
// display
virtual void ListScrollTo( unsigned int n ) ;
// accessing content
virtual unsigned int ListGetCount() const ;
-
+
int ListGetColumnType( int col )
{
return col;
}
virtual void UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ) ;
virtual void UpdateLineToEnd( unsigned int n);
+
+ virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
+ virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
protected :
wxNSTableView* m_tableView ;
-
+
wxNSTableDataSource* m_dataSource;
} ;
wxNSTableViewCellValue( id &v ) : value(v)
{
}
-
+
virtual ~wxNSTableViewCellValue() {}
virtual void Set( CFStringRef v )
{
value = [[(NSString*)v retain] autorelease];
}
- virtual void Set( const wxString& value )
+ virtual void Set( const wxString& value )
{
Set( (CFStringRef) wxCFStringRef( value ) );
}
- virtual void Set( int v )
+ virtual void Set( int v )
{
value = [NSNumber numberWithInt:v];
}
-
- virtual int GetIntValue() const
+
+ virtual int GetIntValue() const
{
if ( [value isKindOfClass:[NSNumber class]] )
return [ (NSNumber*) value intValue ];
-
+
return 0;
}
-
- virtual wxString GetStringValue() const
+
+ virtual wxString GetStringValue() const
{
if ( [value isKindOfClass:[NSString class]] )
- return wxCFStringRef( (CFStringRef) [value retain] ).AsString();
-
+ return wxCFStringRef::AsString( (NSString*) value );
+
return wxEmptyString;
}
-
+
protected:
id& value;
} ;
- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
{
+ wxUnusedVar(aTableView);
if ( impl )
return impl->ListGetCount();
return 0;
}
-- (id)tableView:(NSTableView *)aTableView
- objectValueForTableColumn:(NSTableColumn *)aTableColumn
+- (id)tableView:(NSTableView *)aTableView
+ objectValueForTableColumn:(NSTableColumn *)aTableColumn
row:(NSInteger)rowIndex
{
+ wxUnusedVar(aTableView);
wxNSTableColumn* tablecol = (wxNSTableColumn *)aTableColumn;
wxListBox* lb = dynamic_cast<wxListBox*>(impl->GetWXPeer());
wxCocoaTableColumn* col = [tablecol column];
return value;
}
-- (void)tableView:(NSTableView *)aTableView
- setObjectValue:(id)value forTableColumn:(NSTableColumn *)aTableColumn
+- (void)tableView:(NSTableView *)aTableView
+ setObjectValue:(id)value forTableColumn:(NSTableColumn *)aTableColumn
row:(NSInteger)rowIndex
{
+ wxUnusedVar(aTableView);
wxNSTableColumn* tablecol = (wxNSTableColumn *)aTableColumn;
wxListBox* lb = dynamic_cast<wxListBox*>(impl->GetWXPeer());
wxCocoaTableColumn* col = [tablecol column];
@implementation wxNSTableView
-- (void)setImplementation: (wxListWidgetCocoaImpl *) theImplementation
++ (void)initialize
{
- impl = theImplementation;
-}
-
-- (wxListWidgetCocoaImpl*) implementation
-{
- return impl;
+ static BOOL initialized = NO;
+ if (!initialized)
+ {
+ initialized = YES;
+ wxOSXCocoaClassAddWXMethods( self );
+ }
}
-
@end
//
wxListWidgetCocoaImpl::wxListWidgetCocoaImpl( wxWindowMac* peer, NSScrollView* view, wxNSTableView* tableview, wxNSTableDataSource* data ) :
wxWidgetCocoaImpl( peer, view ), m_tableView(tableview), m_dataSource(data)
{
+ InstallEventHandler( tableview );
}
wxListWidgetCocoaImpl::~wxListWidgetCocoaImpl()
[m_dataSource release];
}
-unsigned int wxListWidgetCocoaImpl::ListGetCount() const
+unsigned int wxListWidgetCocoaImpl::ListGetCount() const
{
wxListBox* lb = dynamic_cast<wxListBox*> ( GetWXPeer() );
return lb->GetCount();
// columns
//
-wxListWidgetColumn* wxListWidgetCocoaImpl::InsertTextColumn( unsigned pos, const wxString& title, bool editable,
- wxAlignment just, int defaultWidth)
+wxListWidgetColumn* wxListWidgetCocoaImpl::InsertTextColumn( unsigned pos, const wxString& WXUNUSED(title), bool editable,
+ wxAlignment WXUNUSED(just), int defaultWidth)
{
wxNSTableColumn* col1 = [[wxNSTableColumn alloc] init];
[col1 setEditable:editable];
-
+
unsigned formerColCount = [m_tableView numberOfColumns];
-
+
// there's apparently no way to insert at a specific position
[m_tableView addTableColumn:col1 ];
if ( pos < formerColCount )
[m_tableView moveColumn:formerColCount toColumn:pos];
-
+
if ( defaultWidth >= 0 )
{
[col1 setMaxWidth:defaultWidth];
[col1 setMinWidth:defaultWidth];
+ [col1 setWidth:defaultWidth];
}
-
+ else
+ {
+ [col1 setMaxWidth:1000];
+ [col1 setMinWidth:10];
+ // temporary hack, because I cannot get the automatic column resizing
+ // to work properly
+ [col1 setWidth:1000];
+ }
+ [col1 setResizingMask: NSTableColumnAutoresizingMask];
wxCocoaTableColumn* wxcol = new wxCocoaTableColumn( col1, editable );
[col1 setColumn:wxcol];
return wxcol;
}
-wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , const wxString& title, bool editable,
- wxAlignment just, int defaultWidth )
+wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , const wxString& WXUNUSED(title), bool editable,
+ wxAlignment WXUNUSED(just), int defaultWidth )
{
wxNSTableColumn* col1 = [[wxNSTableColumn alloc] init];
[col1 setEditable:editable];
-
+
// set your custom cell & set it up
NSButtonCell* checkbox = [[NSButtonCell alloc] init];
[checkbox setTitle:@""];
[checkbox setButtonType:NSSwitchButton];
[col1 setDataCell:checkbox] ;
[checkbox release];
-
+
unsigned formerColCount = [m_tableView numberOfColumns];
-
+
// there's apparently no way to insert at a specific position
[m_tableView addTableColumn:col1 ];
if ( pos < formerColCount )
[m_tableView moveColumn:formerColCount toColumn:pos];
-
+
if ( defaultWidth >= 0 )
{
[col1 setMaxWidth:defaultWidth];
[col1 setMinWidth:defaultWidth];
+ [col1 setWidth:defaultWidth];
}
-
+
+ [col1 setResizingMask: NSTableColumnNoResizing];
wxCocoaTableColumn* wxcol = new wxCocoaTableColumn( col1, editable );
[col1 setColumn:wxcol];
// inserting / removing lines
//
-void wxListWidgetCocoaImpl::ListInsert( unsigned int n )
+void wxListWidgetCocoaImpl::ListInsert( unsigned int WXUNUSED(n) )
{
-#if 0
- {
- wxListBoxCocoaLine* line = new wxListBoxCocoaLine();
- line->SetLabel(items[i]);
- if ( m_items.size() <= n+i )
- m_items.push_back( line );
- else
- m_items.insert(m_items.begin()+n, line);
-/*
- NSMutableDictionary* line = [[NSMutableDictionary alloc] init];
- [line setObject:wxCFStringRef(items[i]).AsNSString() forKey:column1];
- NSMutableArray* array = [m_dataSource items];
- if ( [array count] <= n+i )
- [array addObject:line];
- else
- [array insertObject:line atIndex:n];
-*/
- }
-#endif
[m_tableView reloadData];
}
-void wxListWidgetCocoaImpl::ListDelete( unsigned int n )
+void wxListWidgetCocoaImpl::ListDelete( unsigned int WXUNUSED(n) )
{
[m_tableView reloadData];
}
-void wxListWidgetCocoaImpl::ListClear()
+void wxListWidgetCocoaImpl::ListClear()
{
[m_tableView reloadData];
}
[m_tableView deselectAll:nil];
}
-void wxListWidgetCocoaImpl::ListSetSelection( unsigned int n, bool select, bool multi )
+void wxListWidgetCocoaImpl::ListSetSelection( unsigned int n, bool select, bool multi )
{
// TODO
if ( select )
}
-int wxListWidgetCocoaImpl::ListGetSelection() const
+int wxListWidgetCocoaImpl::ListGetSelection() const
{
- return 0;
+ return [m_tableView selectedRow];
}
-int wxListWidgetCocoaImpl::ListGetSelections( wxArrayInt& aSelections ) const
+int wxListWidgetCocoaImpl::ListGetSelections( wxArrayInt& aSelections ) const
{
- return 0;
+ aSelections.Empty();
+
+ int count = ListGetCount();
+
+ for ( int i = 0; i < count; ++i)
+ {
+ if ([m_tableView isRowSelected:count])
+ aSelections.Add(i);
+ }
+
+ return aSelections.Count();
}
-bool wxListWidgetCocoaImpl::ListIsSelected( unsigned int n ) const
+bool wxListWidgetCocoaImpl::ListIsSelected( unsigned int n ) const
{
- return false;
+ return [m_tableView isRowSelected:n];
}
// display
-void wxListWidgetCocoaImpl::ListScrollTo( unsigned int n )
+void wxListWidgetCocoaImpl::ListScrollTo( unsigned int n )
{
[m_tableView scrollRowToVisible:n];
}
-
-void wxListWidgetCocoaImpl::UpdateLine( unsigned int n, wxListWidgetColumn* col )
+
+void wxListWidgetCocoaImpl::UpdateLine( unsigned int WXUNUSED(n), wxListWidgetColumn* WXUNUSED(col) )
{
// TODO optimize
[m_tableView reloadData];
}
-void wxListWidgetCocoaImpl::UpdateLineToEnd( unsigned int n)
+void wxListWidgetCocoaImpl::UpdateLineToEnd( unsigned int WXUNUSED(n))
{
// TODO optimize
[m_tableView reloadData];
}
+void wxListWidgetCocoaImpl::controlAction(WXWidget WXUNUSED(slf),void* WXUNUSED(_cmd), void *WXUNUSED(sender))
+{
+ wxListBox *list = static_cast<wxListBox*> ( GetWXPeer());
+ wxCHECK_RET( list != NULL , wxT("Listbox expected"));
+
+ wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+
+ int sel = [m_tableView clickedRow];
+ if ((sel < 0) || (sel > (int) list->GetCount())) // OS X can select an item below the last item (why?)
+ return;
+
+ list->HandleLineEvent( sel, false );
+}
+
+void wxListWidgetCocoaImpl::controlDoubleAction(WXWidget WXUNUSED(slf),void* WXUNUSED(_cmd), void *WXUNUSED(sender))
+{
+ wxListBox *list = static_cast<wxListBox*> ( GetWXPeer());
+ wxCHECK_RET( list != NULL , wxT("Listbox expected"));
+
+ int sel = [m_tableView clickedRow];
+ if ((sel < 0) || (sel > (int) list->GetCount())) // OS X can select an item below the last item (why?)
+ return;
+
+ list->HandleLineEvent( sel, true );
+}
// accessing content
-wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
- wxWindowMac* parent,
- wxWindowID id,
- const wxPoint& pos,
+wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
+ wxWindowMac* WXUNUSED(parent),
+ wxWindowID WXUNUSED(id),
+ const wxPoint& pos,
const wxSize& size,
- long style,
- long extraStyle)
+ long style,
+ long WXUNUSED(extraStyle))
{
- NSView* superv = (wxpeer->GetParent()->GetHandle() );
-
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
NSScrollView* scrollview = [[NSScrollView alloc] initWithFrame:r];
-
+
// use same scroll flags logic as msw
-
+
[scrollview setHasVerticalScroller:YES];
-
+
if ( style & wxLB_HSCROLL )
[scrollview setHasHorizontalScroller:YES];
-
+
[scrollview setAutohidesScrollers: ((style & wxLB_ALWAYS_SB) ? NO : YES)];
-
+
// setting up the true table
-
+
wxNSTableView* tableview = [[wxNSTableView alloc] init];
- [scrollview setDocumentView:tableview];
- [tableview release];
-
// only one multi-select mode available
if ( (style & wxLB_EXTENDED) || (style & wxLB_MULTIPLE) )
[tableview setAllowsMultipleSelection:YES];
-
+
// simple listboxes have no header row
[tableview setHeaderView:nil];
-
- [tableview setColumnAutoresizingStyle:NSTableViewLastColumnOnlyAutoresizingStyle];
+
+ if ( style & wxLB_HSCROLL )
+ [tableview setColumnAutoresizingStyle:NSTableViewNoColumnAutoresizing];
+ else
+ [tableview setColumnAutoresizingStyle:NSTableViewLastColumnOnlyAutoresizingStyle];
+
wxNSTableDataSource* ds = [[ wxNSTableDataSource alloc] init];
[tableview setDataSource:ds];
- [superv addSubview:scrollview];
+ [scrollview setDocumentView:tableview];
+ [tableview release];
+
wxListWidgetCocoaImpl* c = new wxListWidgetCocoaImpl( wxpeer, scrollview, tableview, ds );
- [tableview setImplementation:c];
+
+ // temporary hook for dnd
+ [tableview registerForDraggedTypes:[NSArray arrayWithObjects:
+ NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
+
[ds setImplementation:c];
return c;
}
-int wxListBox::DoListHitTest(const wxPoint& inpoint) const
+int wxListBox::DoListHitTest(const wxPoint& WXUNUSED(inpoint)) const
{
#if wxOSX_USE_CARBON
OSStatus err;
projects / wxWidgets.git / blobdiff