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

cleanup - reformat; added assignment of initial selection to match other platform behavior

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-06 03:17:29 +00:00
parent 76e36d4334
commit d34cca534c
1 changed files with 126 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/mac/carbon/choice.cpp
View File

@@ -17,9 +17,10 @@
#include "wx/menu.h"
#include "wx/mac/uma.h"
extern MenuHandle NewUniqueMenu() ;
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
extern MenuHandle NewUniqueMenu() ;
wxChoice::~wxChoice()
{
@@ -35,7 +36,8 @@ wxChoice::~wxChoice()
// DisposeMenu( m_macPopUpMenuHandle ) ;
}
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
bool wxChoice::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
@@ -45,14 +47,17 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
{
wxCArrayString chs( choices );
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
return Create(
parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
style, validator, name );
}
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
bool wxChoice::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
int n, const wxString choices[],
int n,
const wxString choices[],
long style,
const wxValidator& validator,
const wxString& name )
@@ -65,9 +70,10 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
Rect bounds = wxMacGetBoundsForControl( this , pos , size );
m_peer = new wxMacControl( this ) ;
verify_noerr ( CreatePopupButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
-12345 , false /* no variable width */ , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
OSStatus err = CreatePopupButtonControl(
MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
-12345 , false /* no variable width */ , 0 , 0 , 0 , m_peer->GetControlRefAddr() );
verify_noerr( err );
m_macPopUpMenuHandle = NewUniqueMenu() ;
m_peer->SetData<MenuHandle>( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) m_macPopUpMenuHandle ) ;
@@ -76,16 +82,22 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
#if !wxUSE_STL
if ( style & wxCB_SORT )
{
m_strings = wxArrayString(1) ; // autosort
}
// autosort
m_strings = wxArrayString( 1 );
#endif
for ( int i = 0; i < n; i++ )
{
Append( choices[i] );
}
SetBestSize(size); // Needed because it is a wxControlWithItems
// Set the first item as being selected
if (n > 0)
SetSelection( 0 );
// Needed because it is a wxControlWithItems
SetBestSize( size );
return true;
}
@@ -113,17 +125,19 @@ int wxChoice::DoAppend(const wxString& item)
#else
size_t index = m_strings.Add( item );
#endif
m_datas.Insert( NULL , index );
UMAInsertMenuItem( MAC_WXHMENU( m_macPopUpMenuHandle ), item, m_font.GetEncoding(), index );
DoSetItemClientData( index, NULL );
m_peer->SetMaximum( GetCount() );
return index;
}
int wxChoice::DoInsert( const wxString& item, int pos )
{
wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1, wxT("wxChoice::DoInsert: can't insert into sorted list") );
wxCHECK_MSG( (pos >= 0) && (pos <= GetCount()), -1, wxT("wxChoice::DoInsert: invalid index") );
if (pos == GetCount())
return DoAppend( item );
@@ -133,16 +147,17 @@ int wxChoice::DoInsert(const wxString& item, int pos)
m_datas.Insert( NULL, pos );
DoSetItemClientData( pos, NULL );
m_peer->SetMaximum( GetCount() );
return pos;
}
void wxChoice::Delete( int n )
{
wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
wxCHECK_RET( n < GetCount(), wxT("wxChoice::Delete: invalid index") );
if ( HasClientObjectData() )
{
delete GetClientObject( n );
}
::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 ) ;
m_strings.RemoveAt( n ) ;
m_datas.RemoveAt( n ) ;
@@ -156,6 +171,7 @@ void wxChoice::Clear()
{
::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
}
m_strings.Empty() ;
m_datas.Empty() ;
m_peer->SetMaximum( 0 ) ;
@@ -202,7 +218,11 @@ int wxChoice::FindString(const wxString& s, bool bCase ) const
void wxChoice::SetString( int n, const wxString& s )
{
wxCHECK_RET( n >= 0 && (size_t)n < m_strings.GetCount(),
wxT("wxChoice::SetString(): invalid index") );
m_strings[n] = s ;
// apple menu pos is 1-based
UMASetMenuItemText( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 , s , wxFont::GetDefaultEncoding() ) ;
}
@@ -210,7 +230,7 @@ void wxChoice::SetString(int n, const wxString& s)
wxString wxChoice::GetString( int n ) const
{
wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), wxEmptyString,
_T("wxChoice::GetString(): invalid index") );
wxT("wxChoice::GetString(): invalid index") );
return m_strings[n] ;
}
@@ -221,7 +241,7 @@ wxString wxChoice::GetString(int n) const
void wxChoice::DoSetItemClientData( int n, void* clientData )
{
wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
wxT("invalid index in wxChoice::SetClientData") );
wxT("wxChoice::DoSetItemClientData: invalid index") );
m_datas[n] = (char*)clientData ;
}
@@ -229,7 +249,8 @@ void wxChoice::DoSetItemClientData( int n, void* clientData )
void * wxChoice::DoGetItemClientData( int n ) const
{
wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
wxT("invalid index in wxChoice::GetClientData") );
wxT("wxChoice::DoGetClientData: invalid index") );
return (void *)m_datas[n];
}
@@ -246,19 +267,23 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const
wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
int n = GetSelection();
// actually n should be made sure by the os to be a valid selection, but ...
int n = GetSelection();
if ( n > -1 )
{
event.SetInt( n );
event.SetString( GetStringSelection() );
event.SetEventObject( this );
if ( HasClientObjectData() )
event.SetClientObject( GetClientObject( n ) );
else if ( HasClientUntypedData() )
event.SetClientData( GetClientData( n ) );
ProcessCommand( event );
}
return noErr ;
}
@@ -267,11 +292,14 @@ wxSize wxChoice::DoGetBestSize() const
int lbWidth = GetCount() > 0 ? 20 : 100; // some defaults
int lbHeight = 20;
int wLine;
#if TARGET_CARBON
long metric ;
GetThemeMetric( kThemeMetricPopupButtonHeight , &metric );
lbHeight = metric ;
#endif
{
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
if ( m_font.Ok() )
@@ -286,31 +314,39 @@ wxSize wxChoice::DoGetBestSize() const
::TextSize( 9 ) ;
::TextFace( 0 ) ;
}
// Find the widest line
for(int i = 0; i < GetCount(); i++) {
for(int i = 0; i < GetCount(); i++)
{
wxString str( GetString( i ) );
#if wxUSE_UNICODE
Point bounds = { 0, 0 } ;
SInt16 baseline ;
::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,
kThemeCurrentPortFont,
kThemeStateActive,
false,
&bounds,
&baseline );
wLine = bounds.h ;
#else
wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
#endif
lbWidth = wxMax( lbWidth, wLine ) ;
}
// Add room for the popup arrow
lbWidth += 2 * lbHeight ;
// And just a bit more
int cx = ::TextWidth( "X" , 0 , 1 ) ;
lbWidth += cx ;
}
return wxSize( lbWidth, lbHeight );
}