listbox cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
parent
ba5b8a68f7
commit
b4726a583d
@ -30,10 +30,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
||||
BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
const short kTextColumnId = 1024;
|
||||
const short kCheckboxColumnId = 1025;
|
||||
|
||||
|
||||
void wxCheckListBox::Init()
|
||||
{
|
||||
}
|
||||
@ -53,159 +49,6 @@ bool wxCheckListBox::Create(
|
||||
return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), style, validator, name );
|
||||
}
|
||||
|
||||
#if TARGET_API_MAC_OSX
|
||||
static pascal void DataBrowserItemNotificationProc(
|
||||
ControlRef browser,
|
||||
DataBrowserItemID itemID,
|
||||
DataBrowserItemNotification message,
|
||||
DataBrowserItemDataRef itemData )
|
||||
#else
|
||||
static pascal void DataBrowserItemNotificationProc(
|
||||
ControlRef browser,
|
||||
DataBrowserItemID itemID,
|
||||
DataBrowserItemNotification message )
|
||||
#endif
|
||||
{
|
||||
long ref = GetControlReference( browser );
|
||||
if (ref != 0)
|
||||
{
|
||||
wxCheckListBox* list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
|
||||
int i = itemID - 1;
|
||||
if ((i >= 0) && (i < (int)list->GetCount()))
|
||||
{
|
||||
bool trigger = false;
|
||||
wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
|
||||
switch ( message )
|
||||
{
|
||||
case kDataBrowserItemDeselected:
|
||||
if ( list->HasMultipleSelection() )
|
||||
trigger = true;
|
||||
break;
|
||||
|
||||
case kDataBrowserItemSelected:
|
||||
trigger = true;
|
||||
break;
|
||||
|
||||
case kDataBrowserItemDoubleClicked:
|
||||
event.SetEventType( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED );
|
||||
trigger = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if ( trigger )
|
||||
{
|
||||
event.SetEventObject( list );
|
||||
if ( list->HasClientObjectData() )
|
||||
event.SetClientObject( list->GetClientObject( i ) );
|
||||
else if ( list->HasClientUntypedData() )
|
||||
event.SetClientData( list->GetClientData( i ) );
|
||||
event.SetString( list->GetString( i ) );
|
||||
event.SetInt( i );
|
||||
event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : true );
|
||||
wxPostEvent( list->GetEventHandler(), event );
|
||||
|
||||
// direct notification is not always having the listbox GetSelection() having in sync with event
|
||||
// list->GetEventHandler()->ProcessEvent( event );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static pascal OSStatus ListBoxGetSetItemData(
|
||||
ControlRef browser,
|
||||
DataBrowserItemID itemID,
|
||||
DataBrowserPropertyID property,
|
||||
DataBrowserItemDataRef itemData,
|
||||
Boolean changeValue )
|
||||
{
|
||||
OSStatus err = errDataBrowserPropertyNotSupported;
|
||||
|
||||
if ( !changeValue )
|
||||
{
|
||||
switch (property)
|
||||
{
|
||||
case kTextColumnId:
|
||||
{
|
||||
long ref = GetControlReference( browser );
|
||||
if (ref != 0)
|
||||
{
|
||||
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref, wxCheckListBox );
|
||||
int i = itemID - 1;
|
||||
if ((i >= 0) && (i < (int)list->GetCount()))
|
||||
{
|
||||
wxMacCFStringHolder cf( list->GetString( i ), list->GetFont().GetEncoding() );
|
||||
verify_noerr( ::SetDataBrowserItemDataText( itemData, cf ) );
|
||||
err = noErr;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case kCheckboxColumnId:
|
||||
{
|
||||
long ref = GetControlReference( browser );
|
||||
if (ref != 0)
|
||||
{
|
||||
wxCheckListBox* list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
|
||||
int i = itemID - 1;
|
||||
if ((i >= 0) && (i < (int)list->GetCount()))
|
||||
{
|
||||
verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData, list->IsChecked(i) ? kThemeButtonOn : kThemeButtonOff ) );
|
||||
err = noErr;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case kDataBrowserItemIsEditableProperty:
|
||||
{
|
||||
err = ::SetDataBrowserItemDataBooleanValue( itemData, true );
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch ( property )
|
||||
{
|
||||
case kCheckboxColumnId:
|
||||
{
|
||||
long ref = GetControlReference( browser );
|
||||
if (ref != 0)
|
||||
{
|
||||
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref, wxCheckListBox );
|
||||
int i = itemID - 1;
|
||||
if ((i >= 0) && (i < (int)list->GetCount()))
|
||||
{
|
||||
// we have to change this behind the back, since Check() would be triggering another update round
|
||||
bool newVal = !list->IsChecked(i);
|
||||
verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData, newVal ? kThemeButtonOn : kThemeButtonOff ) );
|
||||
err = noErr;
|
||||
list->m_checks[i] = newVal;
|
||||
|
||||
wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId());
|
||||
event.SetInt( i );
|
||||
event.SetEventObject( list );
|
||||
list->GetEventHandler()->ProcessEvent( event );
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
bool wxCheckListBox::Create(
|
||||
wxWindow *parent,
|
||||
wxWindowID id,
|
||||
@ -227,104 +70,12 @@ bool wxCheckListBox::Create(
|
||||
|
||||
// this will be increased by our Append command
|
||||
m_noItems = 0;
|
||||
m_selected = 0;
|
||||
|
||||
Rect bounds = wxMacGetBoundsForControl( this, pos, size );
|
||||
m_peer = (wxMacControl*) CreateMacListControl(pos , size , style );
|
||||
|
||||
m_peer = new wxMacControl( this );
|
||||
OSStatus err = ::CreateDataBrowserControl(
|
||||
MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
|
||||
&bounds, kDataBrowserListView, m_peer->GetControlRefAddr() );
|
||||
verify_noerr( err );
|
||||
MacPostControlCreate(pos,size);
|
||||
|
||||
DataBrowserSelectionFlags options = kDataBrowserDragSelect;
|
||||
if ( style & wxLB_MULTIPLE )
|
||||
{
|
||||
options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
|
||||
}
|
||||
else if ( style & wxLB_EXTENDED )
|
||||
{
|
||||
// default behaviour
|
||||
}
|
||||
else
|
||||
{
|
||||
options |= kDataBrowserSelectOnlyOne;
|
||||
}
|
||||
|
||||
err = m_peer->SetSelectionFlags( options );
|
||||
verify_noerr( err );
|
||||
|
||||
DataBrowserListViewColumnDesc columnDesc;
|
||||
columnDesc.headerBtnDesc.titleOffset = 0;
|
||||
columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
|
||||
|
||||
columnDesc.headerBtnDesc.btnFontStyle.flags =
|
||||
kControlUseFontMask | kControlUseJustMask;
|
||||
|
||||
columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
|
||||
columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
|
||||
columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
|
||||
columnDesc.headerBtnDesc.btnFontStyle.style = normal;
|
||||
columnDesc.headerBtnDesc.titleString = NULL; // CFSTR( "" );
|
||||
|
||||
// check column
|
||||
|
||||
columnDesc.headerBtnDesc.minimumWidth = 30;
|
||||
columnDesc.headerBtnDesc.maximumWidth = 30;
|
||||
|
||||
columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
|
||||
columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
|
||||
columnDesc.propertyDesc.propertyFlags =
|
||||
kDataBrowserPropertyIsMutable
|
||||
| kDataBrowserTableViewSelectionColumn
|
||||
| kDataBrowserDefaultPropertyFlags;
|
||||
err = m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn );
|
||||
verify_noerr( err );
|
||||
|
||||
// text column
|
||||
|
||||
columnDesc.headerBtnDesc.minimumWidth = 0;
|
||||
columnDesc.headerBtnDesc.maximumWidth = 10000;
|
||||
|
||||
columnDesc.propertyDesc.propertyID = kTextColumnId;
|
||||
columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
|
||||
columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
|
||||
| kDataBrowserListViewTypeSelectColumn
|
||||
#endif
|
||||
;
|
||||
|
||||
verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
|
||||
|
||||
verify_noerr( m_peer->AutoSizeListViewColumns() );
|
||||
verify_noerr( m_peer->SetHasScrollBars( false, true ) );
|
||||
verify_noerr( m_peer->SetTableViewHiliteStyle( kDataBrowserTableViewFillHilite ) );
|
||||
verify_noerr( m_peer->SetListViewHeaderBtnHeight( 0 ) );
|
||||
|
||||
DataBrowserCallbacks callbacks;
|
||||
callbacks.version = kDataBrowserLatestCallbacks;
|
||||
InitDataBrowserCallbacks( &callbacks );
|
||||
callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP( &ListBoxGetSetItemData );
|
||||
callbacks.u.v1.itemNotificationCallback =
|
||||
#if TARGET_API_MAC_OSX
|
||||
(DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP( &DataBrowserItemNotificationProc );
|
||||
#else
|
||||
NewDataBrowserItemNotificationUPP( &DataBrowserItemNotificationProc );
|
||||
#endif
|
||||
m_peer->SetCallbacks( &callbacks );
|
||||
|
||||
#if 0
|
||||
// shouldn't be necessary anymore under 10.2
|
||||
m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
|
||||
m_peer->SetNeedsFocusRect( true );
|
||||
#endif
|
||||
|
||||
MacPostControlCreate( pos, size );
|
||||
|
||||
for ( int i = 0; i < n; i++ )
|
||||
{
|
||||
Append( choices[i] );
|
||||
}
|
||||
InsertItems( n , choices , 0 );
|
||||
|
||||
// Needed because it is a wxControlWithItems
|
||||
SetBestSize( size );
|
||||
@ -353,11 +104,7 @@ void wxCheckListBox::Check(unsigned int item, bool check)
|
||||
if ( check != isChecked )
|
||||
{
|
||||
m_checks[item] = check;
|
||||
UInt32 id = item + 1;
|
||||
OSStatus err = m_peer->UpdateItems(
|
||||
kDataBrowserNoItem, 1, &id,
|
||||
kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
|
||||
verify_noerr( err );
|
||||
MacUpdateLine( item );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user