/////////////////////////////////////////////////////////////////////////////
// Name: combobox.cpp
// Purpose: wxComboBox class
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
+// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#endif
#include "wx/combobox.h"
+#include "wx/button.h"
#include "wx/menu.h"
#include "wx/mac/uma.h"
// ----------------------------------------------------------------------------
// the margin between the text control and the choice
+#if TARGET_API_MAC_OSX
+// 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 wxCoord MARGIN = 2;
-static const int POPUPWIDTH = 18;
+static const int TEXTFOCUSBORDER = 0 ;
+#endif
static const int POPUPHEIGHT = 23;
{
public:
wxComboBoxText( wxComboBox * cb )
- : wxTextCtrl( cb->GetParent(), 1 )
+ : wxTextCtrl( cb , 1 )
{
m_cb = cb;
}
protected:
- void OnTextChange( wxCommandEvent& event )
+ void OnChar( wxKeyEvent& event )
{
- wxString s = GetValue();
+ // Allows processing the tab key to go to the next control
+ if (event.GetKeyCode() == WXK_TAB)
+ {
+ 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;
+ }
+ 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 ))
+ {
+ wxWindow *parent = GetParent();
+ while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
+ parent = parent->GetParent() ;
+ }
+ if ( parent && parent->GetDefaultItem() )
+ {
+ wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
+ wxButton);
+ if ( def && def->IsEnabled() )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+ event.SetEventObject(def);
+ def->Command(event);
+ }
+ }
+
+ return;
+ }
+ }
- if (!s.IsEmpty())
- m_cb->DelegateTextChanged( s );
-
event.Skip();
}
+ // Use the KeyUp as a naive approximation for TEXT_UPDATED, even though it is somewhat delayed
+ // but this is less complicated than dealing with idle-ness, and is much better than nothing
+ void OnKeyUp( wxKeyEvent& event )
+ {
+ if ( event.GetKeyCode() != WXK_RETURN )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId());
+ event.SetString( GetValue() );
+ event.SetEventObject( m_cb );
+ m_cb->GetEventHandler()->ProcessEvent(event);
+ }
+ }
private:
wxComboBox *m_cb;
};
BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
- EVT_TEXT(-1, wxComboBoxText::OnTextChange)
+ EVT_CHAR( wxComboBoxText::OnChar)
+ EVT_KEY_UP( wxComboBoxText::OnKeyUp)
END_EVENT_TABLE()
class wxComboBoxChoice : public wxChoice
{
public:
wxComboBoxChoice(wxComboBox *cb, int style)
- : wxChoice( cb->GetParent(), 1 )
+ : wxChoice( cb , 1 )
{
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 )
wxString s = e.GetString();
m_cb->DelegateChoice( s );
+ wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+ event2.SetInt(m_cb->GetSelection());
+ 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() ;
+ if (! m_cb->HasFlag(wxCB_READONLY) )
+ sz.x = GetPopupWidth() ;
+ return sz ;
+ }
private:
wxComboBox *m_cb;
EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
END_EVENT_TABLE()
-
-
-
wxComboBox::~wxComboBox()
{
- // delete the controls now, don't leave them alive even though they woudl
+ // delete client objects
+ FreeData();
+
+ // 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
- delete m_text;
- delete m_choice;
+ if (m_text != NULL) {
+ delete m_text;
+ m_text = NULL;
+ }
+ if (m_choice != NULL) {
+ delete m_choice;
+ m_choice = NULL;
+ }
}
wxSize wxComboBox::DoGetBestSize() const
{
+ if (!m_choice && !m_text)
+ return GetSize();
wxSize size = m_choice->GetBestSize();
- if ( m_text != 0 )
+ 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;
+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 == 0 )
+ if ( m_text == NULL )
{
- m_choice->SetSize(x, y, width, -1);
+ // we might not be fully constructed yet, therefore watch out...
+ if ( m_choice )
+ m_choice->SetSize(0, 0 , width, -1);
}
else
{
- wxCoord wText = width - POPUPWIDTH;
- m_text->SetSize(x, y, wText, height);
- m_choice->SetSize(x + wText + MARGIN, y, 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);
}
}
if ( !wxControl::Enable(enable) )
return FALSE;
- m_choice->Enable(enable);
-
- if ( m_text != 0 )
- {
- m_text->Enable(enable);
- }
-
return TRUE;
}
if ( !wxControl::Show(show) )
return FALSE;
- // under GTK Show() is called the first time before we are fully
- // constructed
- if ( m_choice )
- {
- m_choice->Show(show);
- if ( m_text != 0 )
- {
- m_text->Show(show);
- }
- }
-
return TRUE;
}
- void wxComboBox::SetFocus()
- {
- m_text->SetFocus();
- }
+void wxComboBox::SetFocus()
+{
+ if ( m_text != NULL) {
+ m_text->SetFocus();
+ }
+}
-void wxComboBox::DelegateTextChanged( const wxString& value ) {
+void wxComboBox::DelegateTextChanged( const wxString& value )
+{
+ SetStringSelection( value );
}
const wxString& value,
const wxPoint& pos,
const wxSize& size,
- int n, const wxString choices[],
+ const wxArrayString& choices,
long style,
const wxValidator& validator,
const wxString& name)
{
+ wxCArrayString chs( choices );
- Rect bounds ;
- Str255 title ;
+ return Create( parent, id, value, pos, size, chs.GetCount(),
+ chs.GetStrings(), style, validator, name );
+}
- if ( !wxControl::Create(parent, id, pos, size, style,
+
+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) )
{
return FALSE;
}
- m_choice = new wxComboBoxChoice(this, style);
-
+ m_choice = new wxComboBoxChoice(this, style );
wxSize csize = size;
if ( style & wxCB_READONLY )
{
- m_text = 0;
+ m_text = NULL;
}
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 ] );
}
- // have to disable this window to avoid interfering it with message
- // processing to the text and the button... but pretend it is enabled to
- // make IsEnabled() return TRUE
- wxControl::Enable(FALSE); // don't use non virtual Disable() here!
- m_isEnabled = TRUE;
-
- // we don't even need to show this window itself - and not doing it avoids
- // that it overwrites the text control
- wxControl::Show(FALSE);
+ SetBestSize(size); // Needed because it is a wxControlWithItems
return TRUE;
}
{
wxString result;
- if ( m_text == 0 )
+ if ( m_text == NULL )
{
result = m_choice->GetString( m_choice->GetSelection() );
}
return result;
}
+int wxComboBox::GetCount() const
+{
+ return m_choice->GetCount() ;
+}
+
void wxComboBox::SetValue(const wxString& value)
{
- SetStringSelection( value ) ;
+ if ( HasFlag(wxCB_READONLY) )
+ SetStringSelection( value ) ;
+ else
+ m_text->SetValue( value );
}
// Clipboard operations
void wxComboBox::Copy()
{
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
m_text->Copy();
}
void wxComboBox::Cut()
{
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
m_text->Cut();
}
void wxComboBox::Paste()
{
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
m_text->Paste();
}
void wxComboBox::SetEditable(bool editable)
{
- if ( ( m_text == 0 ) && editable )
+ if ( ( m_text == NULL ) && editable )
{
m_text = new wxComboBoxText( this );
}
- else if ( ( m_text != 0 ) && !editable )
+ else if ( ( m_text != NULL ) && !editable )
{
delete m_text;
- m_text = 0;
+ m_text = NULL;
}
int currentX, currentY;
// TODO
}
-void wxComboBox::Append(const wxString& item)
+int wxComboBox::DoAppend(const wxString& item)
+{
+ return m_choice->DoAppend( item ) ;
+}
+
+int wxComboBox::DoInsert(const wxString& item, int pos)
+{
+ return m_choice->DoInsert( item , pos ) ;
+}
+
+void wxComboBox::DoSetItemClientData(int n, void* clientData)
{
- // I am not sure what other ports do,
- // but wxMac chokes on empty entries.
+ return m_choice->DoSetItemClientData( n , clientData ) ;
+}
- if (!item.IsEmpty())
- m_choice->DoAppend( item );
+void* wxComboBox::DoGetItemClientData(int n) const
+{
+ return m_choice->DoGetItemClientData( n ) ;
+}
+
+void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+{
+ return m_choice->DoSetItemClientObject( n , clientData ) ;
+}
+
+wxClientData* wxComboBox::DoGetItemClientObject(int n) const
+{
+ return m_choice->DoGetItemClientObject( n ) ;
+}
+
+void wxComboBox::FreeData()
+{
+ if ( HasClientObjectData() )
+ {
+ size_t count = GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ SetClientObject( n, NULL );
+ }
+ }
}
void wxComboBox::Delete(int n)
{
+ // force client object deletion
+ if( HasClientObjectData() )
+ SetClientObject( n, NULL );
m_choice->Delete( n );
}
void wxComboBox::Clear()
{
+ FreeData();
m_choice->Clear();
}
{
m_choice->SetSelection( n );
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
m_text->SetValue( GetString( n ) );
}
if (sel > -1)
return wxString(this->GetString (sel));
else
- return wxString("");
+ return wxEmptyString;
}
bool wxComboBox::SetStringSelection(const wxString& sel)
return FALSE;
}
-void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
+void wxComboBox::SetString(int n, const wxString& s)
+{
+ m_choice->SetString( n , s ) ;
+}
+
+
+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);
+ ProcessCommand(event);*/
+ return noErr ;
}
projects / wxWidgets.git / blobdiff