X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd04970ab45eb2f392af48b71aa9ecd5d4b1c8c2..54a6974c51b533d398bfc13f06cf5e26f13866c1:/src/mac/carbon/combobox.cpp diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index bbc3110dbd..71a386b3da 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/mac/carbon/combobox.cpp // Purpose: wxComboBox class -// Author: Stefan Csomor +// Author: Stefan Csomor, Dan "Bud" Keith (composite combobox) // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "combobox.h" -#endif - #include "wx/wxprec.h" #if wxUSE_COMBOBOX @@ -24,15 +20,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -// composite combobox implementation by Dan "Bud" Keith bud@otsys.com - static int nextPopUpMenuId = 1000 ; + MenuHandle NewUniqueMenu() { - MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ; - nextPopUpMenuId++ ; - return handle ; + MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ; + nextPopUpMenuId++ ; + + return handle ; } @@ -89,7 +85,7 @@ protected: if (m_cb->GetEventHandler()->ProcessEvent(kevt)) // If the event was handled and not skipped then we're done return; - + if ( event.GetKeyCode() == WXK_RETURN ) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId()); @@ -97,22 +93,20 @@ protected: event.SetInt( m_cb->GetSelection() ); event.SetEventObject( m_cb ); - // This will invoke the dialog default action, such - // as the clicking the default button. - + // This will invoke the dialog default action, + // such as the clicking the default button. if (!m_cb->GetEventHandler()->ProcessEvent( event )) { wxWindow *parent = GetParent(); - while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) { + while ( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) parent = parent->GetParent() ; - } + if ( parent && parent->GetDefaultItem() ) { - wxButton *def = wxDynamicCast(parent->GetDefaultItem(), - wxButton); + wxButton *def = wxDynamicCast(parent->GetDefaultItem(), wxButton); if ( def && def->IsEnabled() ) { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); } @@ -140,14 +134,14 @@ protected: if (! m_cb->GetEventHandler()->ProcessEvent(event)) event.Skip(); } - + void OnText( wxCommandEvent& event ) { event.SetEventObject(m_cb); event.SetId(m_cb->GetId()); if (! m_cb->GetEventHandler()->ProcessEvent(event)) event.Skip(); - } + } private: wxComboBox *m_cb; @@ -156,20 +150,21 @@ private: }; 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_KEY_DOWN(wxComboBoxText::OnKeyDown) + EVT_CHAR(wxComboBoxText::OnChar) + EVT_KEY_UP(wxComboBoxText::OnKeyUp) + EVT_TEXT(-1, wxComboBoxText::OnText) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice { public: - wxComboBoxChoice(wxComboBox *cb, int style) + wxComboBoxChoice( wxComboBox *cb, int style ) : wxChoice( cb , 1 , wxDefaultPosition , wxDefaultSize , 0 , NULL , style & (wxCB_SORT) ) { m_cb = cb; } + int GetPopupWidth() const { switch ( GetWindowVariant() ) @@ -177,6 +172,7 @@ public: case wxWINDOW_VARIANT_NORMAL : case wxWINDOW_VARIANT_LARGE : return 24 ; + default : return 21 ; } @@ -201,17 +197,21 @@ protected: TextEvent.SetEventObject( m_cb ); m_cb->ProcessCommand( TextEvent ); } + virtual wxSize DoGetBestSize() const { wxSize sz = wxChoice::DoGetBestSize() ; if (! m_cb->HasFlag(wxCB_READONLY) ) sz.x = GetPopupWidth() ; + return sz ; } private: wxComboBox *m_cb; + friend class wxComboBox; + DECLARE_EVENT_TABLE() }; @@ -227,17 +227,19 @@ wxComboBox::~wxComboBox() // delete the controls now, don't leave them alive even though they would // still be eventually deleted by our parent - but it will be too late, the // user code expects them to be gone now - if (m_text != NULL) { + if (m_text != NULL) + { delete m_text; m_text = NULL; } - if (m_choice != NULL) { + + if (m_choice != NULL) + { delete m_choice; m_choice = NULL; } } - // ---------------------------------------------------------------------------- // geometry // ---------------------------------------------------------------------------- @@ -246,6 +248,7 @@ wxSize wxComboBox::DoGetBestSize() const { if (!m_choice && !m_text) return GetSize(); + wxSize size = m_choice->GetBestSize(); if ( m_text != NULL ) @@ -253,6 +256,7 @@ wxSize wxComboBox::DoGetBestSize() const wxSize sizeText = m_text->GetBestSize(); if (sizeText.y > size.y) size.y = sizeText.y; + size.x = m_choice->GetPopupWidth() + sizeText.x + MARGIN; size.x += TEXTFOCUSBORDER ; size.y += 2 * TEXTFOCUSBORDER ; @@ -262,12 +266,13 @@ wxSize wxComboBox::DoGetBestSize() const // clipping is too tight size.y += 1 ; } + return size; } void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { - wxControl::DoMoveWindow(x, y, width , height ); + wxControl::DoMoveWindow( x, y, width , height ); if ( m_text == NULL ) { @@ -278,14 +283,13 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) else { wxCoord wText = width - m_choice->GetPopupWidth() - MARGIN; - m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1 ); + m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1); + // put it at an inset of 1 to have outer area shadows drawn as well m_choice->SetSize(TEXTFOCUSBORDER + wText + MARGIN - 1 , TEXTFOCUSBORDER, m_choice->GetPopupWidth() , -1); } } - - // ---------------------------------------------------------------------------- // operations forwarded to the subcontrols // ---------------------------------------------------------------------------- @@ -295,6 +299,9 @@ bool wxComboBox::Enable(bool enable) if ( !wxControl::Enable(enable) ) return false; + if (m_text) + m_text->Enable(enable); + return true; } @@ -308,32 +315,29 @@ bool wxComboBox::Show(bool show) void wxComboBox::SetFocus() { - if ( m_text != NULL) { + if ( m_text != NULL) m_text->SetFocus(); - } } - void wxComboBox::DelegateTextChanged( const wxString& value ) { SetStringSelection( value ); } - void wxComboBox::DelegateChoice( const wxString& value ) { SetStringSelection( value ); } - -bool wxComboBox::Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) +bool wxComboBox::Create(wxWindow *parent, + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) { wxCArrayString chs( choices ); @@ -341,15 +345,16 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, chs.GetStrings(), style, validator, name ); } - -bool wxComboBox::Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) +bool wxComboBox::Create(wxWindow *parent, + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + int n, + const wxString choices[], + long style, + const wxValidator& validator, + const wxString& name) { if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style , validator, name) ) @@ -380,9 +385,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, m_choice->DoAppend( choices[ i ] ); } - SetBestSize(size); // Needed because it is a wxControlWithItems + // Needed because it is a wxControlWithItems + SetBestSize(size); SetStringSelection(value); - + return true; } @@ -391,13 +397,9 @@ wxString wxComboBox::GetValue() const wxString result; if ( m_text == NULL ) - { result = m_choice->GetString( m_choice->GetSelection() ); - } else - { result = m_text->GetValue(); - } return result; } @@ -416,28 +418,23 @@ void wxComboBox::SetValue(const wxString& value) } // Clipboard operations + void wxComboBox::Copy() { if ( m_text != NULL ) - { m_text->Copy(); - } } void wxComboBox::Cut() { if ( m_text != NULL ) - { m_text->Cut(); - } } void wxComboBox::Paste() { if ( m_text != NULL ) - { m_text->Paste(); - } } void wxComboBox::SetEditable(bool editable) @@ -564,14 +561,12 @@ void wxComboBox::SetSelection(int n) m_choice->SetSelection( n ); if ( m_text != NULL ) - { m_text->SetValue( GetString( n ) ); - } } -int wxComboBox::FindString(const wxString& s) const +int wxComboBox::FindString(const wxString& s, bool bCase) const { - return m_choice->FindString( s ); + return m_choice->FindString( s, bCase ); } wxString wxComboBox::GetString(int n) const @@ -581,7 +576,7 @@ wxString wxComboBox::GetString(int n) const wxString wxComboBox::GetStringSelection() const { - int sel = GetSelection (); + int sel = GetSelection(); if (sel > -1) return wxString(this->GetString (sel)); else @@ -656,14 +651,17 @@ bool wxComboBox::CanRedo() const return false; } -wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { - /* For consistency with other platforms, clicking in the text area does not constitute a selection +/* + For consistency with other platforms, clicking in the text area does not constitute a selection wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId ); event.SetInt(GetSelection()); event.SetEventObject(this); event.SetString(GetStringSelection()); - ProcessCommand(event);*/ + ProcessCommand(event); +*/ + return noErr ; }