// Copyright: (c) AUTHOR
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifdef __GNUG__
#pragma implementation "choice.h"
#endif
-
#include "wx/defs.h"
-
#include "wx/choice.h"
#include "wx/menu.h"
#include "wx/mac/uma.h"
-
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
#endif
-
extern MenuHandle NewUniqueMenu() ;
-
wxChoice::~wxChoice()
{
// DeleteMenu( m_macPopUpMenuId ) ;
// DisposeMenu( m_macPopUpMenuHandle ) ;
}
-
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxValidator& validator,
const wxString& name)
{
-
Rect bounds ;
Str255 title ;
MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
-
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 ,
+ m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 ,
kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ;
m_macPopUpMenuHandle = NewUniqueMenu() ;
- SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
- SetControlMinimum( m_macControl , 0 ) ;
- SetControlMaximum( m_macControl , 0) ;
+ SetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
+ SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
+ SetControl32BitMaximum( (ControlHandle) m_macControl , 0) ;
if ( n > 0 )
- SetControlValue( m_macControl , 1 ) ;
-
+ SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ;
MacPostControlCreate() ;
-
for ( int i = 0; i < n; i++ )
{
Append(choices[i]);
}
return TRUE;
}
-
// ----------------------------------------------------------------------------
// adding/deleting items to/from the list
// ----------------------------------------------------------------------------
-
int wxChoice::DoAppend(const wxString& item)
{
Str255 label;
wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
- AppendMenu( m_macPopUpMenuHandle , label ) ;
+ MacAppendMenu(MAC_WXHMENU( m_macPopUpMenuHandle ) , "\pA");
+ SetMenuItemText(MAC_WXHMENU( m_macPopUpMenuHandle ) ,
+ (SInt16) ::CountMenuItems(MAC_WXHMENU( m_macPopUpMenuHandle ) ), label);
+ // was AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;
m_strings.Add( item ) ;
m_datas.Add( NULL ) ;
int index = m_strings.GetCount() - 1 ;
DoSetItemClientData( index , NULL ) ;
- SetControlMaximum( m_macControl , GetCount()) ;
+ SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
return index ;
}
-
void wxChoice::Delete(int n)
{
wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
-
if ( HasClientObjectData() )
{
delete GetClientObject(n);
}
-
- ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
+ ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
m_strings.Remove( n ) ;
m_datas.RemoveAt( n ) ;
- SetControlMaximum( m_macControl , GetCount()) ;
+ SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
}
-
void wxChoice::Clear()
{
- Free();
-
+ FreeData();
for ( int i = 0 ; i < GetCount() ; i++ )
{
- ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
- }
+ ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
+ }
m_strings.Empty() ;
m_datas.Empty() ;
- SetControlMaximum( m_macControl , 0 ) ;
+ SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;
}
-
-void wxChoice::Free()
+void wxChoice::FreeData()
{
if ( HasClientObjectData() )
{
}
}
}
-
// ----------------------------------------------------------------------------
// selection
// ----------------------------------------------------------------------------
-
int wxChoice::GetSelection() const
{
- return GetControlValue( m_macControl ) -1 ;
+ return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
}
-
void wxChoice::SetSelection(int n)
{
- SetControlValue( m_macControl , n + 1 ) ;
+ SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
}
-
// ----------------------------------------------------------------------------
// string list functions
// ----------------------------------------------------------------------------
-
int wxChoice::GetCount() const
{
return m_strings.GetCount() ;
}
-
int wxChoice::FindString(const wxString& s) const
{
for( int i = 0 ; i < GetCount() ; i++ )
}
return wxNOT_FOUND ;
}
-
void wxChoice::SetString(int n, const wxString& s)
{
- wxFAIL_MSG(wxT("not implemented"));
-
+ wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
#if 0 // should do this, but no Insert() so far
Delete(n);
Insert(n + 1, s);
#endif
}
-
wxString wxChoice::GetString(int n) const
{
return m_strings[n] ;
}
-
// ----------------------------------------------------------------------------
// client data
// ----------------------------------------------------------------------------
-
void wxChoice::DoSetItemClientData( int n, void* clientData )
{
- wxCHECK_RET( n >= 0 && n < m_datas.GetCount(),
+ wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
"invalid index in wxChoice::SetClientData" );
- wxASSERT_MSG( m_datas.GetCount() >= n , "invalid client_data array" ) ;
- if ( m_datas.GetCount() > n )
- {
- m_datas[n] = (char*) clientData ;
- }
- else
- {
- m_datas.Add( (char*) clientData ) ;
- }
+ m_datas[n] = (char*) clientData ;
}
-
-void *wxChoice::DoGetItemClientData(int N) const
+void *wxChoice::DoGetItemClientData(int n) const
{
- wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL,
+ wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
"invalid index in wxChoice::GetClientData" );
-
- return (void *)m_datas[N];
+ return (void *)m_datas[n];
}
-
void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
{
DoSetItemClientData(n, clientData);
}
-
wxClientData* wxChoice::DoGetItemClientObject( int n ) const
{
return (wxClientData *)DoGetItemClientData(n);
}
-
-void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
+void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
{
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
- event.SetInt(GetSelection());
- event.SetEventObject(this);
- event.SetString(GetStringSelection());
- ProcessCommand(event);
+ int n = GetSelection();
+ // actually n should be made sure by the os to be a valid selection, but ...
+ 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);
+ }
}
-
wxSize wxChoice::DoGetBestSize() const
{
- // TODO should modify this to take into account string length ala wxGTK
- return wxSize(100,20);
-}
-
-/*
-void wxChoice::Command(wxCommandEvent & event)
-{
- SetSelection (event.GetInt());
- ProcessCommand (event);
-}
-*/
+ int lbWidth = 100; // some defaults
+ int lbHeight = 20;
+ int wLine;
+#if TARGET_CARBON
+ long metric ;
+ GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );
+ lbHeight = metric ;
+#endif
+ {
+ wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
+ Rect drawRect ;
+ wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
+ if ( font )
+ {
+ ::TextFont( font->m_macFontNum ) ;
+ ::TextSize( short(font->m_macFontSize) ) ;
+ ::TextFace( font->m_macFontStyle ) ;
+ }
+ else
+ {
+ ::TextFont( kFontIDMonaco ) ;
+ ::TextSize( 9 );
+ ::TextFace( 0 ) ;
+ }
+ // Find the widest line
+ for(int i = 0; i < GetCount(); i++) {
+ wxString str(GetString(i));
+ wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
+ lbWidth = wxMax(lbWidth, wLine);
+ }
+ // Add room for the popup arrow
+ lbWidth += 2 * lbHeight ;
+ // And just a bit more
+ int cy = 12 ;
+ int cx = ::TextWidth( "X" , 0 , 1 ) ;
+ lbWidth += cx ;
+
+ }
+ return wxSize(lbWidth, lbHeight);
+}
\ No newline at end of file
projects / wxWidgets.git / blobdiff