/////////////////////////////////////////////////////////////////////////////
// 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
/////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
// 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;
wxWindow *parent = GetParent();
while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
- parent = parent->GetParent() ;
+ parent = parent->GetParent() ;
}
if ( parent && parent->GetDefaultItem() )
{
{
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.SetString(m_cb->GetStringSelection());
m_cb->ProcessCommand(event2);
}
+ virtual wxSize DoGetBestSize() const
+ {
+ wxSize sz = wxChoice::DoGetBestSize() ;
+ if (! m_cb->HasFlag(wxCB_READONLY) )
+ sz.x = GetPopupWidth() ;
+ return sz ;
+ }
private:
wxComboBox *m_cb;
wxComboBox::~wxComboBox()
{
- // delete the controls now, don't leave them alive even though they would
+ // 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
if (m_text != NULL) {
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;
+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 )
{
- m_choice->SetSize(0, 0 , 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(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);
}
}
}
+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 );
+
+ return Create( parent, id, value, pos, size, chs.GetCount(),
+ chs.GetStrings(), style, validator, name );
+}
+
+
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos,
}
m_choice = new wxComboBoxChoice(this, style );
-
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 ;
}
}
m_choice->DoAppend( choices[ i ] );
}
+ SetBestSize(size); // Needed because it is a wxControlWithItems
+
return TRUE;
}
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
// 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)
+{
+ return m_choice->DoSetItemClientData( n , clientData ) ;
+}
+
+void* wxComboBox::DoGetItemClientData(int n) const
+{
+ return m_choice->DoGetItemClientData( n ) ;
+}
+
+void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
{
- // I am not sure what other ports do,
- // but wxMac chokes on empty entries.
+ return m_choice->DoSetItemClientObject( n , clientData ) ;
+}
- if (!item.IsEmpty())
- m_choice->DoAppend( item );
+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();
}
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 WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) )
+void wxComboBox::SetString(int n, const wxString& s)
+{
+ m_choice->SetString( n , s ) ;
+}
+
+
+wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
event.SetInt(GetSelection());
event.SetEventObject(this);
event.SetString(GetStringSelection());
ProcessCommand(event);
+ return noErr ;
}
projects / wxWidgets.git / blobdiff