Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup - fixed warnings, reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-03-15 06:22:36 +00:00
parent 74af7bcf4f
commit c18353e561
2 changed files with 175 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

328
src/mac/carbon/checklst.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: checklst.cpp
// Name: src/mac/carbon/checklst.cpp
// Purpose: implementation of wxCheckListBox class
// Author: Stefan Csomor
// Modified by:
@@ -8,10 +8,9 @@
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
//
// new DataBrowser-based version
// ============================================================================
// headers & declarations
// ============================================================================
#include "wx/wxprec.h"
@@ -21,143 +20,149 @@
#include "wx/arrstr.h"
#include "wx/mac/uma.h"
#ifndef __DARWIN__
#include <Appearance.h>
#endif
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
END_EVENT_TABLE()
const short kTextColumnId = 1024 ;
const short kCheckboxColumnId = 1025 ;
const short kTextColumnId = 1024;
const short kCheckboxColumnId = 1025;
// new databrowser based version
// Listbox item
void wxCheckListBox::Init()
{
}
bool wxCheckListBox::Create(wxWindow *parent,
wxWindowID id,
const wxPoint &pos,
const wxSize &size,
const wxArrayString& choices,
long style,
const wxValidator& validator,
const wxString &name)
bool wxCheckListBox::Create(
wxWindow *parent,
wxWindowID id,
const wxPoint &pos,
const wxSize &size,
const wxArrayString& choices,
long style,
const wxValidator& validator,
const wxString &name )
{
wxCArrayString chs(choices);
wxCArrayString chs( choices );
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
style, validator, name);
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)
static pascal void DataBrowserItemNotificationProc(
ControlRef browser,
DataBrowserItemID itemID,
DataBrowserItemNotification message,
DataBrowserItemDataRef itemData )
#else
static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
DataBrowserItemNotification message)
static pascal void DataBrowserItemNotificationProc(
ControlRef browser,
DataBrowserItemID itemID,
DataBrowserItemNotification message )
#endif
{
long ref = GetControlReference( browser ) ;
if ( ref )
long ref = GetControlReference( browser );
if (ref != 0)
{
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
int i = itemID - 1 ;
if (i >= 0 && i < list->GetCount() )
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 )
bool trigger = false;
wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
switch ( message )
{
case kDataBrowserItemDeselected :
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 ;
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) );
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 synch with event
// list->GetEventHandler()->ProcessEvent(event) ;
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)
static pascal OSStatus ListBoxGetSetItemData(
ControlRef browser,
DataBrowserItemID itemID,
DataBrowserPropertyID property,
DataBrowserItemDataRef itemData,
Boolean changeValue )
{
OSStatus err = errDataBrowserPropertyNotSupported;
if ( ! changeValue )
if ( !changeValue )
{
switch (property)
{
case kTextColumnId:
{
long ref = GetControlReference( browser ) ;
if ( ref )
long ref = GetControlReference( browser );
if (ref != 0)
{
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
int i = itemID - 1 ;
if (i >= 0 && i < list->GetCount() )
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 ;
wxMacCFStringHolder cf( list->GetString( i ), list->GetFont().GetEncoding() );
verify_noerr( ::SetDataBrowserItemDataText( itemData, cf ) );
err = noErr;
}
}
}
break;
case kCheckboxColumnId :
case kCheckboxColumnId:
{
long ref = GetControlReference( browser ) ;
if ( ref )
long ref = GetControlReference( browser );
if (ref != 0)
{
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
int i = itemID - 1 ;
if (i >= 0 && i < list->GetCount() )
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 ;
verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData, list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) );
err = noErr;
}
}
}
break ;
break;
case kDataBrowserItemIsEditableProperty:
{
err = ::SetDataBrowserItemDataBooleanValue(itemData, true);
err = ::SetDataBrowserItemDataBooleanValue( itemData, true );
}
break;
@@ -167,69 +172,75 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
}
else
{
switch( property )
switch ( property )
{
case kCheckboxColumnId :
case kCheckboxColumnId:
{
long ref = GetControlReference( browser ) ;
if ( ref )
long ref = GetControlReference( browser );
if (ref != 0)
{
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
int i = itemID - 1 ;
if (i >= 0 && i < list->GetCount() )
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 ;
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);
event.SetInt( i );
event.SetEventObject( list );
list->GetEventHandler()->ProcessEvent( event );
}
}
}
break ;
break;
default :
break ;
default:
break;
}
}
return err;
}
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
int n, const wxString choices[],
long style,
const wxValidator& validator,
const wxString& name)
bool wxCheckListBox::Create(
wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
int n,
const wxString choices[],
long style,
const wxValidator& validator,
const wxString& name )
{
m_macIsUserPane = false ;
m_macIsUserPane = false;
wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
_T("only one of listbox selection modes can be specified") );
wxT("only one of listbox selection modes can be specified") );
if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
return false;
m_noItems = 0 ; // this will be increased by our append command
// this will be increased by our Append command
m_noItems = 0;
m_selected = 0;
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
Rect bounds = wxMacGetBoundsForControl( this, pos, size );
m_peer = new wxMacControl(this) ;
verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
m_peer = new wxMacControl( this );
OSStatus err = ::CreateDataBrowserControl(
MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
&bounds, kDataBrowserListView, m_peer->GetControlRefAddr() );
verify_noerr( err );
DataBrowserSelectionFlags options = kDataBrowserDragSelect ;
DataBrowserSelectionFlags options = kDataBrowserDragSelect;
if ( style & wxLB_MULTIPLE )
{
options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection ;
options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
}
else if ( style & wxLB_EXTENDED )
{
@@ -237,11 +248,13 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
}
else
{
options += kDataBrowserSelectOnlyOne ;
options |= kDataBrowserSelectOnlyOne;
}
verify_noerr(m_peer->SetSelectionFlags( options ) );
DataBrowserListViewColumnDesc columnDesc ;
err = m_peer->SetSelectionFlags( options );
verify_noerr( err );
DataBrowserListViewColumnDesc columnDesc;
columnDesc.headerBtnDesc.titleOffset = 0;
columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
@@ -252,18 +265,21 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
columnDesc.headerBtnDesc.btnFontStyle.style = normal;
columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
columnDesc.headerBtnDesc.titleString = NULL; // CFSTR( "" );
// check column
columnDesc.headerBtnDesc.minimumWidth = 30 ;
columnDesc.headerBtnDesc.minimumWidth = 30;
columnDesc.headerBtnDesc.maximumWidth = 30;
columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn |
kDataBrowserDefaultPropertyFlags;
verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
columnDesc.propertyDesc.propertyFlags =
kDataBrowserPropertyIsMutable
| kDataBrowserTableViewSelectionColumn
| kDataBrowserDefaultPropertyFlags;
err = m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn );
verify_noerr( err );
// text column
@@ -278,40 +294,40 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
#endif
;
verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
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 ) );
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 ;
DataBrowserCallbacks callbacks;
callbacks.version = kDataBrowserLatestCallbacks;
InitDataBrowserCallbacks(&callbacks);
callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
InitDataBrowserCallbacks( &callbacks );
callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP( &ListBoxGetSetItemData );
callbacks.u.v1.itemNotificationCallback =
#if TARGET_API_MAC_OSX
(DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
(DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP( &DataBrowserItemNotificationProc );
#else
NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
NewDataBrowserItemNotificationUPP( &DataBrowserItemNotificationProc );
#endif
m_peer->SetCallbacks( &callbacks);
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 ) ;
m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
m_peer->SetNeedsFocusRect( true );
#endif
MacPostControlCreate(pos,size) ;
MacPostControlCreate( pos, size );
for ( int i = 0 ; i < n ; i++ )
for ( int i = 0; i < n; i++ )
{
Append( choices[i] ) ;
Append( choices[i] );
}
SetBestSize(size); // Needed because it is a wxControlWithItems
// Needed because it is a wxControlWithItems
SetBestSize( size );
return true;
}
@@ -323,7 +339,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
bool wxCheckListBox::IsChecked(size_t item) const
{
wxCHECK_MSG( item < m_checks.GetCount(), false,
_T("invalid index in wxCheckListBox::IsChecked") );
wxT("invalid index in wxCheckListBox::IsChecked") );
return m_checks[item] != 0;
}
@@ -331,14 +347,17 @@ bool wxCheckListBox::IsChecked(size_t item) const
void wxCheckListBox::Check(size_t item, bool check)
{
wxCHECK_RET( item < m_checks.GetCount(),
_T("invalid index in wxCheckListBox::Check") );
wxT("invalid index in wxCheckListBox::Check") );
bool isChecked = m_checks[item] != 0;
if ( check != isChecked )
{
m_checks[item] = check;
UInt32 id = item + 1 ;
verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
UInt32 id = item + 1;
OSStatus err = m_peer->UpdateItems(
kDataBrowserNoItem, 1, &id,
kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
verify_noerr( err );
}
}
@@ -348,43 +367,42 @@ void wxCheckListBox::Check(size_t item, bool check)
void wxCheckListBox::Delete(int n)
{
wxCHECK_RET( n < GetCount(), _T("invalid index in wxCheckListBox::Delete") );
wxCHECK_RET( (size_t)n < GetCount(), wxT("invalid index in wxCheckListBox::Delete") );
wxListBox::Delete(n);
m_checks.RemoveAt(n);
wxListBox::Delete( n );
m_checks.RemoveAt( n );
}
int wxCheckListBox::DoAppend(const wxString& item)
{
int pos = wxListBox::DoAppend(item);
int pos = wxListBox::DoAppend( item );
// the item is initially unchecked
m_checks.Insert(false, pos);
m_checks.Insert( false, pos );
return pos;
}
void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
{
wxListBox::DoInsertItems(items, pos);
wxListBox::DoInsertItems( items, pos );
size_t count = items.GetCount();
for ( size_t n = 0; n < count; n++ )
{
m_checks.Insert(false, pos + n);
m_checks.Insert( false, pos + n );
}
}
void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
{
// call it first as it does DoClear()
wxListBox::DoSetItems(items, clientData);
wxListBox::DoSetItems( items, clientData );
size_t count = items.GetCount();
for ( size_t n = 0; n < count; n++ )
{
m_checks.Add(false);
m_checks.Add( false );
}
}

8
src/mac/carbon/radiobox.cpp
View File

@@ -9,10 +9,6 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
//-------------------------------------------------------------------------------------
// headers
//-------------------------------------------------------------------------------------
#include "wx/wxprec.h"
#if wxUSE_RADIOBOX
@@ -107,7 +103,7 @@ bool wxRadioBox::Create( wxWindow *parent,
SetMajorDim( majorDim == 0 ? n : majorDim, style );
m_label = label ;
m_label = label;
Rect bounds = wxMacGetBoundsForControl( this, pos, size );
if ( bounds.right <= bounds.left )
@@ -433,7 +429,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
y_offset = y_start;
current = m_radioButtonCycle;
for ( i = 0 ; i < m_noItems; i++)
for (i = 0 ; i < (int)m_noItems; i++)
{
// not to do for the zero button!
if ((i > 0) && ((i % GetMajorDim()) == 0))