/////////////////////////////////////////////////////////////////////////////
-// 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$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
#include "wx/combobox.h"
-#include "wx/button.h"
-#include "wx/menu.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"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
-// composite combobox implementation by Dan "Bud" Keith bud@otsys.com
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl)
+
+BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+ WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
+END_EVENT_TABLE()
static int nextPopUpMenuId = 1000 ;
-MenuHandle NewUniqueMenu()
+
+MenuHandle NewUniqueMenu()
{
- MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
- nextPopUpMenuId++ ;
- return handle ;
+ MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() );
+ nextPopUpMenuId++ ;
+
+ return handle ;
}
// ----------------------------------------------------------------------------
// the margin between the text control and the choice
-static const wxCoord MARGIN = 2;
#if TARGET_API_MAC_OSX
-static const int POPUPWIDTH = 24;
+// margin should be bigger on OS X due to blue highlight
+// around text control.
+static const wxCoord MARGIN = 4;
+// this is the border a focus rect on OSX is needing
+static const int TEXTFOCUSBORDER = 3 ;
#else
-static const int POPUPWIDTH = 18;
+static const wxCoord MARGIN = 2;
+static const int TEXTFOCUSBORDER = 0 ;
#endif
-static const int POPUPHEIGHT = 23;
// ----------------------------------------------------------------------------
: wxTextCtrl( cb , 1 )
{
m_cb = cb;
+ SetTriggerOnSetValue( false );
}
protected:
void OnChar( wxKeyEvent& event )
{
- if ( event.GetKeyCode() == WXK_RETURN )
+ // Allows processing the tab key to go to the next control
+ if (event.GetKeyCode() == WXK_TAB)
{
- wxString value = GetValue();
-
- if ( m_cb->GetCount() == 0 )
- {
- // make Enter generate "selected" event if there is only one item
- // in the combobox - without it, it's impossible to select it at
- // all!
- wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
- event.SetInt( 0 );
- event.SetString( value );
- event.SetEventObject( m_cb );
- m_cb->GetEventHandler()->ProcessEvent( event );
- }
- else
- {
- // add the item to the list if it's not there yet
- if ( m_cb->FindString(value) == wxNOT_FOUND )
- {
- m_cb->Append(value);
- m_cb->SetStringSelection(value);
-
- // and generate the selected event for it
- wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
- event.SetInt( m_cb->GetCount() - 1 );
- event.SetString( value );
- event.SetEventObject( m_cb );
- m_cb->GetEventHandler()->ProcessEvent( event );
- }
+ wxNavigationKeyEvent NavEvent;
+ NavEvent.SetEventObject(this);
+ NavEvent.SetDirection(true);
+ NavEvent.SetWindowChange(false);
+
+ // Get the parent of the combo and have it process the navigation?
+ if (m_cb->GetParent()->GetEventHandler()->ProcessEvent(NavEvent))
+ return;
+ }
- // This will invoke the dialog default action, such
- // as the clicking the default button.
+ // send the event to the combobox class in case the user has bound EVT_CHAR
+ wxKeyEvent kevt(event);
+ kevt.SetEventObject(m_cb);
+ if (m_cb->GetEventHandler()->ProcessEvent(kevt))
+ // If the event was handled and not skipped then we're done
+ return;
- wxWindow *parent = GetParent();
- while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
- parent = parent->GetParent() ;
- }
- if ( parent && parent->GetDefaultItem() )
+ if ( event.GetKeyCode() == WXK_RETURN )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId());
+ event.SetString( GetValue() );
+ event.SetInt( m_cb->GetSelection() );
+ event.SetEventObject( m_cb );
+
+ // This will invoke the dialog default action,
+ // such as the clicking the default button.
+ if (!m_cb->GetEventHandler()->ProcessEvent( event ))
+ {
+ 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() );
+ wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
event.SetEventObject(def);
def->Command(event);
- return ;
- }
+ }
}
return;
}
}
-
+
event.Skip();
}
+ void OnKeyUp( wxKeyEvent& event )
+ {
+ event.SetEventObject(m_cb);
+ event.SetId(m_cb->GetId());
+ if (! m_cb->GetEventHandler()->ProcessEvent(event))
+ event.Skip();
+ }
+
+ void OnKeyDown( wxKeyEvent& event )
+ {
+ event.SetEventObject(m_cb);
+ event.SetId(m_cb->GetId());
+ 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;
};
BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
- EVT_CHAR( wxComboBoxText::OnChar)
+ EVT_KEY_DOWN(wxComboBoxText::OnKeyDown)
+ EVT_CHAR(wxComboBoxText::OnChar)
+ EVT_KEY_UP(wxComboBoxText::OnKeyUp)
+ EVT_TEXT(wxID_ANY, wxComboBoxText::OnText)
END_EVENT_TABLE()
class wxComboBoxChoice : public wxChoice
{
public:
- wxComboBoxChoice(wxComboBox *cb, int style)
- : wxChoice( cb , 1 )
+ wxComboBoxChoice( wxComboBox *cb, int style )
+ : wxChoice( cb , 1 , wxDefaultPosition , wxDefaultSize , 0 , NULL , style & (wxCB_SORT) )
{
m_cb = cb;
}
+ int GetPopupWidth() const
+ {
+ switch ( GetWindowVariant() )
+ {
+ case wxWINDOW_VARIANT_NORMAL :
+ case wxWINDOW_VARIANT_LARGE :
+ return 24 ;
+
+ default :
+ return 21 ;
+ }
+ }
+
protected:
void OnChoice( wxCommandEvent& e )
{
event2.SetEventObject(m_cb);
event2.SetString(m_cb->GetStringSelection());
m_cb->ProcessCommand(event2);
+
+ // For consistency with MSW and GTK, also send a text updated event
+ // After all, the text is updated when a selection is made
+ wxCommandEvent TextEvent( wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId() );
+ TextEvent.SetString( m_cb->GetStringSelection() );
+ TextEvent.SetEventObject( m_cb );
+ m_cb->ProcessCommand( TextEvent );
}
+
virtual wxSize DoGetBestSize() const
{
wxSize sz = wxChoice::DoGetBestSize() ;
- sz.x = POPUPWIDTH ;
+ if (! m_cb->HasFlag(wxCB_READONLY) )
+ sz.x = GetPopupWidth() ;
+
return sz ;
- }
+ }
private:
wxComboBox *m_cb;
+ friend class wxComboBox;
+
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
- EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+ EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)
END_EVENT_TABLE()
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
// ----------------------------------------------------------------------------
wxSize wxComboBox::DoGetBestSize() const
{
+ if (!m_choice && !m_text)
+ return GetSize();
+
wxSize size = m_choice->GetBestSize();
-
+
if ( m_text != NULL )
{
wxSize sizeText = m_text->GetBestSize();
-
- size.x = POPUPWIDTH + sizeText.x + MARGIN;
+ if (sizeText.y > size.y)
+ size.y = sizeText.y;
+
+ size.x = m_choice->GetPopupWidth() + sizeText.x + MARGIN;
+ size.x += TEXTFOCUSBORDER ;
+ size.y += 2 * TEXTFOCUSBORDER ;
+ }
+ else
+ {
+ // clipping is too tight
+ size.y += 1 ;
}
return size;
}
-void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
- height = POPUPHEIGHT;
-
- wxControl::DoMoveWindow(x, y, width, height);
+void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
+{
+ wxControl::DoMoveWindow( x, y, width , height );
if ( m_text == NULL )
{
}
else
{
- wxCoord wText = width - POPUPWIDTH - MARGIN;
- m_text->SetSize(0, 0, wText, height);
- m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
- }
-}
-
+ wxCoord wText = width - m_choice->GetPopupWidth() - MARGIN;
+ 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
bool wxComboBox::Enable(bool enable)
{
if ( !wxControl::Enable(enable) )
- return FALSE;
+ return false;
- return TRUE;
+ if (m_text)
+ m_text->Enable(enable);
+
+ return true;
}
bool wxComboBox::Show(bool show)
{
if ( !wxControl::Show(show) )
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
-void wxComboBox::SetFocus()
-{
- if ( m_text != NULL) {
- m_text->SetFocus();
- }
-}
-
-
void wxComboBox::DelegateTextChanged( const wxString& value )
{
SetStringSelection( value );
}
-
void wxComboBox::DelegateChoice( const wxString& value )
{
SetStringSelection( value );
}
+void wxComboBox::Init()
+{
+ WX_INIT_CONTROL_CONTAINER();
+}
-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 );
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 ,
- wxDefaultValidator, name) )
+ validator, name) )
{
- return FALSE;
+ return false;
}
m_choice = new wxComboBoxChoice(this, style );
- m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;
wxSize csize = size;
if ( style & wxCB_READONLY )
{
else
{
m_text = new wxComboBoxText(this);
- if ( size.y == -1 ) {
- csize.y = m_text->GetSize().y ;
+ if ( size.y == -1 )
+ {
+ csize.y = m_text->GetSize().y ;
+ csize.y += 2 * TEXTFOCUSBORDER ;
}
}
-
+
DoSetSize(pos.x, pos.y, csize.x, csize.y);
-
+
for ( int i = 0 ; i < n ; i++ )
{
m_choice->DoAppend( choices[ i ] );
}
- SetBestSize(csize); // Needed because it is a wxControlWithItems
+ // Needed because it is a wxControlWithItems
+ SetInitialSize(size);
+ SetStringSelection(value);
- return TRUE;
+ return true;
}
wxString wxComboBox::GetValue() const
{
wxString result;
-
+
if ( m_text == NULL )
- {
result = m_choice->GetString( m_choice->GetSelection() );
- }
else
- {
result = m_text->GetValue();
- }
return result;
}
+unsigned int wxComboBox::GetCount() const
+{
+ return m_choice->GetCount() ;
+}
+
void wxComboBox::SetValue(const wxString& value)
{
- int s = FindString (value);
- if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
- {
- m_choice->Append(value) ;
- }
- SetStringSelection( value ) ;
+ if ( HasFlag(wxCB_READONLY) )
+ SetStringSelection( value ) ;
+ else
+ m_text->SetValue( 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)
int currentX, currentY;
GetPosition( ¤tX, ¤tY );
-
+
int currentW, currentH;
GetSize( ¤tW, ¤tH );
void wxComboBox::SetInsertionPoint(long pos)
{
- // TODO
+ if ( m_text )
+ m_text->SetInsertionPoint(pos);
}
void wxComboBox::SetInsertionPointEnd()
{
- // TODO
+ if ( m_text )
+ m_text->SetInsertionPointEnd();
}
long wxComboBox::GetInsertionPoint() const
{
- // TODO
+ if ( m_text )
+ return m_text->GetInsertionPoint();
return 0;
}
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
{
- // TODO
+ if ( m_text )
+ return m_text->GetLastPosition();
return 0;
}
void wxComboBox::Replace(long from, long to, const wxString& value)
{
- // TODO
+ if ( m_text )
+ m_text->Replace(from,to,value);
}
void wxComboBox::Remove(long from, long to)
{
- // TODO
+ if ( m_text )
+ m_text->Remove(from,to);
}
void wxComboBox::SetSelection(long from, long to)
{
- // TODO
+ if ( m_text )
+ m_text->SetSelection(from,to);
}
-int wxComboBox::DoAppend(const wxString& item)
+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 ) ;
}
{
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() )
void wxComboBox::SetSelection(int n)
{
m_choice->SetSelection( n );
-
+
if ( m_text != NULL )
- {
- m_text->SetValue( GetString( n ) );
- }
+ m_text->SetValue(n != wxNOT_FOUND ? GetString(n) : wxString(wxEmptyString));
}
-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
+wxString wxComboBox::GetString(unsigned int n) const
{
return m_choice->GetString( n );
}
wxString wxComboBox::GetStringSelection() const
{
- int sel = GetSelection ();
- if (sel > -1)
- return wxString(this->GetString (sel));
+ int sel = GetSelection();
+ if (sel != wxNOT_FOUND)
+ return wxString(this->GetString((unsigned int)sel));
else
return wxEmptyString;
}
-bool wxComboBox::SetStringSelection(const wxString& sel)
+void wxComboBox::SetString(unsigned int n, const wxString& s)
{
- int s = FindString (sel);
- if (s > -1)
- {
- SetSelection (s);
- return TRUE;
- }
+ m_choice->SetString( n , s );
+}
+
+bool wxComboBox::IsEditable() const
+{
+ return m_text != NULL && !HasFlag(wxCB_READONLY);
+}
+
+void wxComboBox::Undo()
+{
+ if (m_text != NULL)
+ m_text->Undo();
+}
+
+void wxComboBox::Redo()
+{
+ if (m_text != NULL)
+ m_text->Redo();
+}
+
+void wxComboBox::SelectAll()
+{
+ if (m_text != NULL)
+ m_text->SelectAll();
+}
+
+bool wxComboBox::CanCopy() const
+{
+ if (m_text != NULL)
+ return m_text->CanCopy();
else
- return FALSE;
+ return false;
}
-void wxComboBox::SetString(int n, const wxString& s)
+bool wxComboBox::CanCut() const
{
- m_choice->SetString( n , s ) ;
+ if (m_text != NULL)
+ return m_text->CanCut();
+ else
+ return false;
}
+bool wxComboBox::CanPaste() const
+{
+ if (m_text != NULL)
+ return m_text->CanPaste();
+ else
+ return false;
+}
-wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+bool wxComboBox::CanUndo() const
{
+ if (m_text != NULL)
+ return m_text->CanUndo();
+ else
+ return false;
+}
+
+bool wxComboBox::CanRedo() const
+{
+ if (m_text != NULL)
+ return m_text->CanRedo();
+ else
+ return false;
+}
+
+wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+{
+/*
+ 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);
+*/
+
return noErr ;
}
+#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff