#if wxUSE_COMBOBOX
#include "wx/combobox.h"
-#include "wx/button.h"
-#include "wx/menu.h"
-#include "wx/containr.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"
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl)
BEGIN_EVENT_TABLE(wxComboBox, wxControl)
WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
MenuHandle NewUniqueMenu()
{
- MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
+ MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() );
nextPopUpMenuId++ ;
return handle ;
static const wxCoord MARGIN = 2;
static const int TEXTFOCUSBORDER = 0 ;
#endif
-static const int POPUPHEIGHT = 23;
// ----------------------------------------------------------------------------
// 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() )
+ 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() );
event.SetEventObject(def);
def->Command(event);
- }
+ }
}
return;
EVT_KEY_DOWN(wxComboBoxText::OnKeyDown)
EVT_CHAR(wxComboBoxText::OnChar)
EVT_KEY_UP(wxComboBoxText::OnKeyUp)
- EVT_TEXT(-1, wxComboBoxText::OnText)
+ EVT_TEXT(wxID_ANY, wxComboBoxText::OnText)
END_EVENT_TABLE()
class wxComboBoxChoice : public wxChoice
};
BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
- EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+ EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)
END_EVENT_TABLE()
wxComboBox::~wxComboBox()
{
- // 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
void wxComboBox::Init()
{
- m_container.SetContainerWindow(this);
+ WX_INIT_CONTROL_CONTAINER();
}
bool wxComboBox::Create(wxWindow *parent,
const wxValidator& validator,
const wxString& name)
{
- wxCArrayString chs( choices );
-
- return Create( parent, id, value, pos, size, chs.GetCount(),
- chs.GetStrings(), style, validator, name );
+ return Create( parent, id, value, pos, size, 0, NULL,
+ style, validator, name );
}
bool wxComboBox::Create(wxWindow *parent,
DoSetSize(pos.x, pos.y, csize.x, csize.y);
- for ( int i = 0 ; i < n ; i++ )
- {
- m_choice->DoAppend( choices[ i ] );
- }
+ Append( n, choices );
// Needed because it is a wxControlWithItems
- SetBestSize(size);
+ SetInitialSize(size);
SetStringSelection(value);
return true;
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;
}
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
-}
-
-int wxComboBox::DoAppend(const wxString& item)
-{
- return m_choice->DoAppend( item ) ;
-}
+ if ( m_text )
+ m_text->SetSelection(from,to);
+}
+
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ 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;
+ }
-int wxComboBox::DoInsert(const wxString& item, unsigned int pos)
-{
- return m_choice->DoInsert( item , pos ) ;
+ return rc;
}
void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
{
- return m_choice->DoSetItemClientData( n , clientData ) ;
+ return m_choice->SetClientData( n , clientData ) ;
}
void* wxComboBox::DoGetItemClientData(unsigned int n) const
{
- return m_choice->DoGetItemClientData( n ) ;
+ return m_choice->GetClientData( n ) ;
}
-void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
+void wxComboBox::DoDeleteOneItem(unsigned int n)
{
- return m_choice->DoSetItemClientObject(n, clientData);
-}
-
-wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
-{
- return m_choice->DoGetItemClientObject( n ) ;
-}
-
-void wxComboBox::FreeData()
-{
- if ( HasClientObjectData() )
- {
- unsigned int count = GetCount();
- for ( unsigned int n = 0; n < count; n++ )
- {
- SetClientObject( n, NULL );
- }
- }
-}
-
-void wxComboBox::Delete(unsigned int n)
-{
- // force client object deletion
- if( HasClientObjectData() )
- SetClientObject( n, NULL );
m_choice->Delete( n );
}
-void wxComboBox::Clear()
+void wxComboBox::DoClear()
{
- FreeData();
m_choice->Clear();
}
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, bool bCase) const
return noErr ;
}
-#endif
+#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff