#include "wx/menu.h"
#include "wx/containr.h"
#include "wx/toplevel.h"
+ #include "wx/textctrl.h"
#endif
#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 TEXTFOCUSBORDER = 0 ;
-#endif
// ----------------------------------------------------------------------------
const wxValidator& validator,
const wxString& name)
{
- return Create( parent, id, value, pos, size, 0, NULL,
- style, validator, name );
+ if ( !Create( parent, id, value, pos, size, 0, NULL,
+ style, validator, name ) )
+ return false;
+
+ Append(choices);
+
+ return true;
}
bool wxComboBox::Create(wxWindow *parent,
m_text->SetValue( value );
}
+void wxComboBox::WriteText(const wxString& text)
+{
+ m_text->WriteText(text);
+}
+
+void wxComboBox::GetSelection(long *from, long *to) const
+{
+ m_text->GetSelection(from, to);
+}
+
// Clipboard operations
void wxComboBox::Copy()
void **clientData,
wxClientDataType type)
{
- // wxItemContainer should probably be doing it itself but usually this is
- // not necessary as the derived class DoInsertItems() calls
- // AssignNewItemClientData() which initializes m_clientDataItemsType
- // correctly; however as we just forward everything to wxChoice, we need to
- // do it ourselves
- //
- // also notice that we never use wxClientData_Object with wxChoice as we
- // don't want it to delete the data -- we will
- int rc = m_choice->DoInsertItems(items, pos, clientData,
- clientData ? wxClientData_Void
- : wxClientData_None) ;
- if ( rc != wxNOT_FOUND )
- {
- if ( !HasClientData() && type != wxClientData_None )
- m_clientDataItemsType = type;
- }
-
- return rc;
+ return m_choice->DoInsertItems(items, pos, clientData, type);
}
void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
{
- return m_choice->SetClientData( n , clientData ) ;
+ return m_choice->DoSetItemClientData( n , clientData ) ;
}
void* wxComboBox::DoGetItemClientData(unsigned int n) const
{
- return m_choice->GetClientData( n ) ;
+ return m_choice->DoGetItemClientData( n ) ;
+}
+
+wxClientDataType wxComboBox::GetClientDataType() const
+{
+ return m_choice->GetClientDataType();
+}
+
+void wxComboBox::SetClientDataType(wxClientDataType clientDataItemsType)
+{
+ m_choice->SetClientDataType(clientDataItemsType);
}
void wxComboBox::DoDeleteOneItem(unsigned int n)
{
- m_choice->Delete( n );
+ m_choice->DoDeleteOneItem( n );
}
void wxComboBox::DoClear()
{
- m_choice->Clear();
+ m_choice->DoClear();
}
int wxComboBox::GetSelection() const