X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8dc6614e60709a87d13615c050f743fa1c17ec9d..5dafb071ba85e7329aa4a0ac176f3ec8e13e55dc:/src/mac/carbon/combobox.cpp?ds=inline diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index 56238d61d6..f2c79697b6 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -14,14 +14,19 @@ #if wxUSE_COMBOBOX #include "wx/combobox.h" -#include "wx/button.h" -#include "wx/menu.h" -#include "wx/containr.h" + +#ifndef WX_PRECOMP + #include "wx/button.h" + #include "wx/menu.h" + #include "wx/containr.h" + #include "wx/toplevel.h" +#endif + #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox) +WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl) BEGIN_EVENT_TABLE(wxComboBox, wxControl) WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox) @@ -32,7 +37,7 @@ static int nextPopUpMenuId = 1000 ; MenuHandle NewUniqueMenu() { - MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ; + MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() ); nextPopUpMenuId++ ; return handle ; @@ -54,7 +59,6 @@ static const int TEXTFOCUSBORDER = 3 ; static const wxCoord MARGIN = 2; static const int TEXTFOCUSBORDER = 0 ; #endif -static const int POPUPHEIGHT = 23; // ---------------------------------------------------------------------------- @@ -68,6 +72,7 @@ public: : wxTextCtrl( cb , 1 ) { m_cb = cb; + SetTriggerOnSetValue( false ); } protected: @@ -104,19 +109,16 @@ protected: // such as the clicking the default button. if (!m_cb->GetEventHandler()->ProcessEvent( event )) { - wxWindow *parent = GetParent(); - while ( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) - parent = parent->GetParent() ; - - if ( parent && parent->GetDefaultItem() ) + wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( tlw && tlw->GetDefaultItem() ) { - wxButton *def = wxDynamicCast(parent->GetDefaultItem(), wxButton); + wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton); if ( def && def->IsEnabled() ) { wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); - } + } } return; @@ -160,7 +162,7 @@ BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) EVT_KEY_DOWN(wxComboBoxText::OnKeyDown) EVT_CHAR(wxComboBoxText::OnChar) EVT_KEY_UP(wxComboBoxText::OnKeyUp) - EVT_TEXT(-1, wxComboBoxText::OnText) + EVT_TEXT(wxID_ANY, wxComboBoxText::OnText) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice @@ -223,7 +225,7 @@ private: }; BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice) - EVT_CHOICE(-1, wxComboBoxChoice::OnChoice) + EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice) END_EVENT_TABLE() wxComboBox::~wxComboBox() @@ -410,7 +412,7 @@ wxString wxComboBox::GetValue() const return result; } -int wxComboBox::GetCount() const +unsigned int wxComboBox::GetCount() const { return m_choice->GetCount() ; } @@ -506,27 +508,27 @@ int wxComboBox::DoAppend(const wxString& item) return m_choice->DoAppend( item ) ; } -int wxComboBox::DoInsert(const wxString& item, int pos) +int wxComboBox::DoInsert(const wxString& item, unsigned int pos) { return m_choice->DoInsert( item , pos ) ; } -void wxComboBox::DoSetItemClientData(int n, void* clientData) +void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData) { return m_choice->DoSetItemClientData( n , clientData ) ; } -void* wxComboBox::DoGetItemClientData(int n) const +void* wxComboBox::DoGetItemClientData(unsigned int n) const { return m_choice->DoGetItemClientData( n ) ; } -void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData) +void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { - return m_choice->DoSetItemClientObject( n , clientData ) ; + return m_choice->DoSetItemClientObject(n, clientData); } -wxClientData* wxComboBox::DoGetItemClientObject(int n) const +wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const { return m_choice->DoGetItemClientObject( n ) ; } @@ -535,15 +537,15 @@ void wxComboBox::FreeData() { if ( HasClientObjectData() ) { - size_t count = GetCount(); - for ( size_t n = 0; n < count; n++ ) + unsigned int count = GetCount(); + for ( unsigned int n = 0; n < count; n++ ) { SetClientObject( n, NULL ); } } } -void wxComboBox::Delete(int n) +void wxComboBox::Delete(unsigned int n) { // force client object deletion if( HasClientObjectData() ) @@ -567,7 +569,7 @@ void wxComboBox::SetSelection(int n) m_choice->SetSelection( n ); if ( m_text != NULL ) - m_text->SetValue( GetString( n ) ); + m_text->SetValue(GetString(n)); } int wxComboBox::FindString(const wxString& s, bool bCase) const @@ -575,7 +577,7 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const return m_choice->FindString( s, bCase ); } -wxString wxComboBox::GetString(int n) const +wxString wxComboBox::GetString(unsigned int n) const { return m_choice->GetString( n ); } @@ -583,15 +585,15 @@ wxString wxComboBox::GetString(int n) const wxString wxComboBox::GetStringSelection() const { int sel = GetSelection(); - if (sel > -1) - return wxString(this->GetString (sel)); + if (sel != wxNOT_FOUND) + return wxString(this->GetString((unsigned int)sel)); else return wxEmptyString; } -void wxComboBox::SetString(int n, const wxString& s) +void wxComboBox::SetString(unsigned int n, const wxString& s) { - m_choice->SetString( n , s ) ; + m_choice->SetString( n , s ); } bool wxComboBox::IsEditable() const @@ -671,4 +673,4 @@ wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT return noErr ; } -#endif +#endif // wxUSE_COMBOBOX