/////////////////////////////////////////////////////////////////////////////
-// Name: choice.cpp
+// Name: src/mac/carbon/choice.cpp
// Purpose: wxChoice
// Author: Stefan Csomor
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_CHOICE
-#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() ;
// DisposeMenu( m_macPopUpMenuHandle ) ;
}
+bool wxChoice::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);
+
+ return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name);
+}
+
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 , wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
- m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 ,
- kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ;
-
+ m_macIsUserPane = false ;
+
+ if ( !wxChoiceBase::Create(parent, id, pos, size, style, validator, name) )
+ return false;
+
+ 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() ) );
+
+
m_macPopUpMenuHandle = NewUniqueMenu() ;
- SetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
- SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
- SetControl32BitMaximum( (ControlHandle) m_macControl , 0) ;
- if ( n > 0 )
- SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ;
- MacPostControlCreate() ;
+ m_peer->SetData<MenuHandle>( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) m_macPopUpMenuHandle ) ;
+ m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 ) ;
+ MacPostControlCreate(pos,size) ;
+
+#if !wxUSE_STL
+ if ( style & wxCB_SORT )
+ {
+ m_strings = wxArrayString(1) ; // autosort
+ }
+#endif
+
for ( int i = 0; i < n; i++ )
{
Append(choices[i]);
}
- return TRUE;
+ SetBestSize(size); // Needed because it is a wxControlWithItems
+ return true;
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
int wxChoice::DoAppend(const wxString& item)
{
- UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
- m_strings.Add( item ) ;
- m_datas.Add( NULL ) ;
- int index = m_strings.GetCount() - 1 ;
+#if wxUSE_STL
+ wxArrayString::iterator insertPoint;
+ size_t index;
+
+ if (GetWindowStyle() & wxCB_SORT)
+ {
+ insertPoint = std::lower_bound( m_strings.begin(), m_strings.end(), item );
+ index = insertPoint - m_strings.begin();
+ }
+ else
+ {
+ insertPoint = m_strings.end();
+ index = m_strings.size();
+ }
+
+ m_strings.insert( insertPoint, 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 ) ;
- SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+ m_peer->SetMaximum( GetCount() ) ;
return index ;
}
if (pos == GetCount())
return DoAppend(item);
- UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
+ UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() , pos );
m_strings.Insert( item, pos ) ;
m_datas.Insert( NULL, pos ) ;
DoSetItemClientData( pos , NULL ) ;
- SetControl32BitMaximum( (ControlHandle) m_macControl , pos) ;
+ m_peer->SetMaximum( GetCount() ) ;
return pos ;
}
delete GetClientObject(n);
}
::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
- m_strings.Remove( n ) ;
+ m_strings.RemoveAt( n ) ;
m_datas.RemoveAt( n ) ;
- SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+ m_peer->SetMaximum( GetCount() ) ;
}
void wxChoice::Clear()
}
m_strings.Empty() ;
m_datas.Empty() ;
- SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;
+ m_peer->SetMaximum( 0 ) ;
}
void wxChoice::FreeData()
// ----------------------------------------------------------------------------
int wxChoice::GetSelection() const
{
- return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
+ return m_peer->GetValue() -1 ;
}
void wxChoice::SetSelection(int n)
{
- SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
+ m_peer->SetValue( n + 1 ) ;
}
// ----------------------------------------------------------------------------
return m_strings.GetCount() ;
}
-int wxChoice::FindString(const wxString& s) const
+int wxChoice::FindString(const wxString& s, bool bCase ) const
{
- for( int i = 0 ; i < GetCount() ; i++ )
- {
- if ( GetString( i ).IsSameAs(s, FALSE) )
- return i ;
- }
- return wxNOT_FOUND ;
+ return m_strings.Index( s , bCase ) ;
}
void wxChoice::SetString(int n, const wxString& s)
{
- 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
+ m_strings[n] = s ;
+ // apple menu pos is 1-based
+ UMASetMenuItemText( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 , s , wxFont::GetDefaultEncoding() ) ;
}
wxString wxChoice::GetString(int n) const
{
+ wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), wxEmptyString,
+ _T("wxChoice::GetString(): invalid index") );
+
return m_strings[n] ;
}
+
// ----------------------------------------------------------------------------
// client data
// ----------------------------------------------------------------------------
{
wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
wxT("invalid index in wxChoice::SetClientData") );
-
+
m_datas[n] = (char*) clientData ;
}
return (wxClientData *)DoGetItemClientData(n);
}
-void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
+wxInt32 wxChoice::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
int n = GetSelection();
event.SetClientData( GetClientData(n) );
ProcessCommand(event);
}
+ return noErr ;
}
wxSize wxChoice::DoGetBestSize() const
int wLine;
#if TARGET_CARBON
long metric ;
- GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );
- lbHeight = metric ;
+ GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );
+ lbHeight = metric ;
#endif
{
- wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
- wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
- if ( font )
+ wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
+ if ( m_font.Ok() )
{
- ::TextFont( font->m_macFontNum ) ;
- ::TextSize( short(font->m_macFontSize) ) ;
- ::TextFace( font->m_macFontStyle ) ;
+ ::TextFont( m_font.MacGetFontNum() ) ;
+ ::TextSize( m_font.MacGetFontSize() ) ;
+ ::TextFace( m_font.MacGetFontStyle() ) ;
}
else
{
#if wxUSE_UNICODE
Point bounds={0,0} ;
SInt16 baseline ;
- ::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
+ ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,
kThemeCurrentPortFont,
kThemeStateActive,
false,
&baseline );
wLine = bounds.h ;
#else
- wxCharBuffer text = wxMacStringToCString( str ) ;
- wLine = ::TextWidth( text , 0 , strlen(text) ) ;
+ wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
#endif
lbWidth = wxMax(lbWidth, wLine);
}
// And just a bit more
int cx = ::TextWidth( "X" , 0 , 1 ) ;
lbWidth += cx ;
-
+
}
return wxSize(lbWidth, lbHeight);
}
+
+#endif // wxUSE_CHOICE
projects / wxWidgets.git / blobdiff