#include "wx/sizer.h"
+#include "itemcontainer.h"
#include "widgets.h"
#if 1
#include "icons/combobox.xpm"
// control ids
enum
{
- ComboPage_Reset = 100,
+ ComboPage_Reset = wxID_HIGHEST,
+ ComboPage_SetCurrent,
ComboPage_CurText,
+ ComboPage_InsertionPointText,
ComboPage_Insert,
ComboPage_InsertText,
ComboPage_Add,
ComboPage_Delete,
ComboPage_DeleteText,
ComboPage_DeleteSel,
- ComboPage_Combo
+ ComboPage_SetValue,
+ ComboPage_SetValueText,
+ ComboPage_Combo,
+ ComboPage_ContainerTests
};
// kinds of comboboxes
// ComboboxWidgetsPage
// ----------------------------------------------------------------------------
-class ComboboxWidgetsPage : public WidgetsPage
+class ComboboxWidgetsPage : public ItemContainerWidgetsPage
{
public:
- ComboboxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+ ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_combobox; }
+ virtual wxTextEntryBase *GetTextEntry() const { return m_combobox; }
+ virtual wxItemContainer* GetContainer() const { return m_combobox; }
+ virtual void RecreateWidget() { CreateCombo(); }
+
+ // lazy creation of the content
+ virtual void CreateContent();
protected:
// event handlers
void OnButtonAdd(wxCommandEvent& event);
void OnButtonAddSeveral(wxCommandEvent& event);
void OnButtonAddMany(wxCommandEvent& event);
+ void OnButtonSetValue(wxCommandEvent& event);
+ void OnButtonSetCurrent(wxCommandEvent& event);
+ void OnDropdown(wxCommandEvent& event);
+ void OnCloseup(wxCommandEvent& event);
void OnComboBox(wxCommandEvent& event);
void OnComboText(wxCommandEvent& event);
void OnCheckOrRadioBox(wxCommandEvent& event);
- void OnUpdateUICurText(wxUpdateUIEvent& event);
+ void OnUpdateUIInsertionPointText(wxUpdateUIEvent& event);
void OnUpdateUIInsert(wxUpdateUIEvent& event);
void OnUpdateUIAddSeveral(wxUpdateUIEvent& event);
void OnUpdateUIDeleteButton(wxUpdateUIEvent& event);
void OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event);
void OnUpdateUIResetButton(wxUpdateUIEvent& event);
+ void OnUpdateUISetCurrent(wxUpdateUIEvent& event);
// reset the combobox parameters
void Reset();
// the checkboxes for styles
wxCheckBox *m_chkSort,
- *m_chkReadonly;
+ *m_chkReadonly,
+ *m_chkFilename;
// the combobox itself and the sizer it is in
wxComboBox *m_combobox;
wxTextCtrl *m_textInsert,
*m_textAdd,
*m_textChange,
- *m_textDelete;
+ *m_textSetValue,
+ *m_textDelete,
+ *m_textCur;
private:
DECLARE_EVENT_TABLE()
EVT_BUTTON(ComboPage_Add, ComboboxWidgetsPage::OnButtonAdd)
EVT_BUTTON(ComboPage_AddSeveral, ComboboxWidgetsPage::OnButtonAddSeveral)
EVT_BUTTON(ComboPage_AddMany, ComboboxWidgetsPage::OnButtonAddMany)
+ EVT_BUTTON(ComboPage_SetValue, ComboboxWidgetsPage::OnButtonSetValue)
+ EVT_BUTTON(ComboPage_SetCurrent, ComboboxWidgetsPage::OnButtonSetCurrent)
+ EVT_BUTTON(ComboPage_ContainerTests, ItemContainerWidgetsPage::OnButtonTestItemContainer)
EVT_TEXT_ENTER(ComboPage_InsertText, ComboboxWidgetsPage::OnButtonInsert)
EVT_TEXT_ENTER(ComboPage_AddText, ComboboxWidgetsPage::OnButtonAdd)
EVT_TEXT_ENTER(ComboPage_DeleteText, ComboboxWidgetsPage::OnButtonDelete)
- EVT_UPDATE_UI(ComboPage_CurText, ComboboxWidgetsPage::OnUpdateUICurText)
+ EVT_UPDATE_UI(ComboPage_InsertionPointText, ComboboxWidgetsPage::OnUpdateUIInsertionPointText)
EVT_UPDATE_UI(ComboPage_Reset, ComboboxWidgetsPage::OnUpdateUIResetButton)
EVT_UPDATE_UI(ComboPage_Insert, ComboboxWidgetsPage::OnUpdateUIInsert)
EVT_UPDATE_UI(ComboPage_Change, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
EVT_UPDATE_UI(ComboPage_ChangeText, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
EVT_UPDATE_UI(ComboPage_DeleteSel, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
+ EVT_UPDATE_UI(ComboPage_SetCurrent, ComboboxWidgetsPage::OnUpdateUISetCurrent)
EVT_COMBOBOX(ComboPage_Combo, ComboboxWidgetsPage::OnComboBox)
+ EVT_COMBOBOX_DROPDOWN(ComboPage_Combo, ComboboxWidgetsPage::OnDropdown)
+ EVT_COMBOBOX_CLOSEUP(ComboPage_Combo, ComboboxWidgetsPage::OnCloseup)
EVT_TEXT(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
EVT_TEXT_ENTER(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
// implementation
// ============================================================================
-IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, _T("Combobox"));
+#if defined(__WXUNIVERSAL__)
+ #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+ #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
-ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book,
+IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, wxT("Combobox"),
+ FAMILY_CTRLS | WITH_ITEMS_CTRLS | COMBO_CTRLS
+ );
+
+ComboboxWidgetsPage::ComboboxWidgetsPage(WidgetsBookCtrl *book,
wxImageList *imaglist)
- : WidgetsPage(book)
+ : ItemContainerWidgetsPage(book, imaglist, combobox_xpm)
{
// init everything
m_chkSort =
- m_chkReadonly = (wxCheckBox *)NULL;
+ m_chkReadonly =
+ m_chkFilename = (wxCheckBox *)NULL;
m_combobox = (wxComboBox *)NULL;
m_sizerCombo = (wxSizer *)NULL;
+}
- imaglist->Add(wxBitmap(combobox_xpm));
-
+void ComboboxWidgetsPage::CreateContent()
+{
/*
What we create here is a frame having 3 panes: style pane is the
leftmost one, in the middle the pane with buttons allowing to perform
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
- wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
+ wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));
// should be in sync with ComboKind_XXX values
static const wxString kinds[] =
{
- _T("default"),
- _T("simple"),
- _T("drop down"),
+ wxT("default"),
+ wxT("simple"),
+ wxT("drop down"),
};
- m_radioKind = new wxRadioBox(this, wxID_ANY, _T("Combobox &kind:"),
+ m_radioKind = new wxRadioBox(this, wxID_ANY, wxT("Combobox &kind:"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(kinds), kinds,
1, wxRA_SPECIFY_COLS);
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
- m_chkSort = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Sort items"));
- m_chkReadonly = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Read only"));
+ m_chkSort = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Sort items"));
+ m_chkReadonly = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Read only"));
+ m_chkFilename = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&File name"));
+ m_chkFilename->Disable(); // not implemented yet
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
sizerLeft->Add(m_radioKind, 0, wxGROW | wxALL, 5);
- wxButton *btn = new wxButton(this, ComboPage_Reset, _T("&Reset"));
+ wxButton *btn = new wxButton(this, ComboPage_Reset, wxT("&Reset"));
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
- _T("&Change combobox contents"));
+ wxT("&Change combobox contents"));
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxSizer *sizerRow;
+ sizerRow = CreateSizerWithTextAndButton(ComboPage_SetCurrent,
+ wxT("Current &selection"),
+ ComboPage_CurText,
+ &m_textCur);
+
+ sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+
wxTextCtrl *text;
- sizerRow = CreateSizerWithTextAndLabel(_T("Current selection"),
- ComboPage_CurText,
+ sizerRow = CreateSizerWithTextAndLabel(wxT("Insertion Point"),
+ ComboPage_InsertionPointText,
&text);
text->SetEditable(false);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(ComboPage_Insert,
- _T("&Insert this string"),
+ wxT("&Insert this string"),
ComboPage_InsertText,
&m_textInsert);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(ComboPage_Add,
- _T("&Add this string"),
+ wxT("&Add this string"),
ComboPage_AddText,
&m_textAdd);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
- btn = new wxButton(this, ComboPage_AddSeveral, _T("&Append a few strings"));
+ btn = new wxButton(this, ComboPage_AddSeveral, wxT("&Append a few strings"));
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
- btn = new wxButton(this, ComboPage_AddMany, _T("Append &many strings"));
+ btn = new wxButton(this, ComboPage_AddMany, wxT("Append &many strings"));
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(ComboPage_Change,
- _T("C&hange current"),
+ wxT("C&hange current"),
ComboPage_ChangeText,
&m_textChange);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(ComboPage_Delete,
- _T("&Delete this item"),
+ wxT("&Delete this item"),
ComboPage_DeleteText,
&m_textDelete);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
- btn = new wxButton(this, ComboPage_DeleteSel, _T("Delete &selection"));
+ btn = new wxButton(this, ComboPage_DeleteSel, wxT("Delete &selection"));
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
- btn = new wxButton(this, ComboPage_Clear, _T("&Clear"));
+ btn = new wxButton(this, ComboPage_Clear, wxT("&Clear"));
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
+ sizerRow = CreateSizerWithTextAndButton(ComboPage_SetValue,
+ wxT("SetValue"),
+ ComboPage_SetValueText,
+ &m_textSetValue);
+ sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+
+ btn = new wxButton(this, ComboPage_ContainerTests, wxT("Run &tests"));
+ sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
+
+
+
// right pane
wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL);
m_combobox = new wxComboBox(this, ComboPage_Combo, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
0, NULL,
0);
- sizerRight->Add(m_combobox, 1, wxGROW | wxALL, 5);
+ sizerRight->Add(m_combobox, 0, wxGROW | wxALL, 5);
sizerRight->SetMinSize(150, 0);
m_sizerCombo = sizerRight; // save it to modify it later
Reset();
SetSizer(sizerTop);
-
- sizerTop->Fit(this);
}
// ----------------------------------------------------------------------------
{
m_chkSort->SetValue(false);
m_chkReadonly->SetValue(false);
+ m_chkFilename->SetValue(false);
}
void ComboboxWidgetsPage::CreateCombo()
{
- int flags = 0;
+ int flags = ms_defaultFlags;
if ( m_chkSort->GetValue() )
flags |= wxCB_SORT;
switch ( m_radioKind->GetSelection() )
{
default:
- wxFAIL_MSG( _T("unknown combo kind") );
+ wxFAIL_MSG( wxT("unknown combo kind") );
// fall through
case ComboKind_Default:
wxArrayString items;
if ( m_combobox )
{
- int count = m_combobox->GetCount();
- for ( int n = 0; n < count; n++ )
+ unsigned int count = m_combobox->GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
items.Add(m_combobox->GetString(n));
}
0, NULL,
flags);
- size_t count = items.GetCount();
- for ( size_t n = 0; n < count; n++ )
+#if 0
+ if ( m_chkFilename->GetValue() )
+ ;
+#endif // TODO
+
+ unsigned int count = items.GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
m_combobox->Append(items[n]);
}
- m_sizerCombo->Add(m_combobox, 1, wxGROW | wxALL, 5);
+ m_sizerCombo->Add(m_combobox, 0, wxGROW | wxALL, 5);
m_sizerCombo->Layout();
}
void ComboboxWidgetsPage::OnButtonChange(wxCommandEvent& WXUNUSED(event))
{
int sel = m_combobox->GetSelection();
- if ( sel != -1 )
+ if ( sel != wxNOT_FOUND )
{
#ifndef __WXGTK__
m_combobox->SetString(sel, m_textChange->GetValue());
#else
- wxLogMessage(_T("Not implemented in wxGTK"));
+ wxLogMessage(wxT("Not implemented in wxGTK"));
#endif
}
}
{
unsigned long n;
if ( !m_textDelete->GetValue().ToULong(&n) ||
- (n >= (unsigned)m_combobox->GetCount()) )
+ (n >= m_combobox->GetCount()) )
{
return;
}
void ComboboxWidgetsPage::OnButtonDeleteSel(wxCommandEvent& WXUNUSED(event))
{
int sel = m_combobox->GetSelection();
- if ( sel != -1 )
+ if ( sel != wxNOT_FOUND )
{
m_combobox->Delete(sel);
}
}
+void ComboboxWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
+{
+ wxString value = m_textSetValue->GetValue();
+ m_combobox->SetValue( value );
+}
+
void ComboboxWidgetsPage::OnButtonClear(wxCommandEvent& WXUNUSED(event))
{
m_combobox->Clear();
if ( !m_textInsert->IsModified() )
{
// update the default string
- m_textInsert->SetValue(wxString::Format(_T("test item %u"), ++s_item));
+ m_textInsert->SetValue(wxString::Format(wxT("test item %u"), ++s_item));
}
if (m_combobox->GetSelection() >= 0)
if ( !m_textAdd->IsModified() )
{
// update the default string
- m_textAdd->SetValue(wxString::Format(_T("test item %u"), ++s_item));
+ m_textAdd->SetValue(wxString::Format(wxT("test item %u"), ++s_item));
}
m_combobox->Append(s);
// "many" means 1000 here
for ( unsigned int n = 0; n < 1000; n++ )
{
- m_combobox->Append(wxString::Format(_T("item #%u"), n));
+ m_combobox->Append(wxString::Format(wxT("item #%u"), n));
}
}
+void ComboboxWidgetsPage::OnButtonSetCurrent(wxCommandEvent& WXUNUSED(event))
+{
+ long n;
+ if ( !m_textCur->GetValue().ToLong(&n) )
+ return;
+
+ m_combobox->SetSelection(n);
+}
+
void ComboboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& WXUNUSED(event))
{
- m_combobox->Append(_T("First"));
- m_combobox->Append(_T("another one"));
- m_combobox->Append(_T("and the last (very very very very very very very very very very long) one"));
+ m_combobox->Append(wxT("First"));
+ m_combobox->Append(wxT("another one"));
+ m_combobox->Append(wxT("and the last (very very very very very very very very very very long) one"));
}
-void ComboboxWidgetsPage::OnUpdateUICurText(wxUpdateUIEvent& event)
+void ComboboxWidgetsPage::OnUpdateUIInsertionPointText(wxUpdateUIEvent& event)
{
if (m_combobox)
- event.SetText( wxString::Format(_T("%d"), m_combobox->GetSelection()) );
+ event.SetText( wxString::Format(wxT("%ld"), m_combobox->GetInsertionPoint()) );
}
void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
{
- if (m_combobox)
- event.Enable( m_chkSort->GetValue() || m_chkReadonly->GetValue() );
+ event.Enable( m_chkSort->GetValue() ||
+ m_chkReadonly->GetValue() ||
+ m_chkFilename->GetValue() );
}
void ComboboxWidgetsPage::OnUpdateUIInsert(wxUpdateUIEvent& event)
void ComboboxWidgetsPage::OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event)
{
if (m_combobox)
- event.Enable(m_combobox->GetSelection() != -1);
+ event.Enable(m_combobox->GetSelection() != wxNOT_FOUND);
}
void ComboboxWidgetsPage::OnUpdateUIClearButton(wxUpdateUIEvent& event)
event.Enable(!(m_combobox->GetWindowStyle() & wxCB_SORT));
}
+void ComboboxWidgetsPage::OnUpdateUISetCurrent(wxUpdateUIEvent& event)
+{
+ long n;
+ event.Enable( m_textCur->GetValue().ToLong(&n) &&
+ (n == wxNOT_FOUND ||
+ (n >= 0 && (unsigned)n < m_combobox->GetCount())) );
+}
+
void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
{
if (!m_combobox)
wxString s = event.GetString();
wxASSERT_MSG( s == m_combobox->GetValue(),
- _T("event and combobox values should be the same") );
+ wxT("event and combobox values should be the same") );
if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
- wxLogMessage(_T("Combobox enter pressed (now '%s')"), s.c_str());
+ {
+ wxLogMessage(wxT("Combobox enter pressed (now '%s')"), s.c_str());
+ }
else
- wxLogMessage(_T("Combobox text changed (now '%s')"), s.c_str());
+ {
+ wxLogMessage(wxT("Combobox text changed (now '%s')"), s.c_str());
+ }
}
void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
{
long sel = event.GetInt();
- m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
+ const wxString selstr = wxString::Format(wxT("%ld"), sel);
+ m_textDelete->SetValue(selstr);
+ m_textCur->SetValue(selstr);
- wxLogMessage(_T("Combobox item %ld selected"), sel);
+ wxLogMessage(wxT("Combobox item %ld selected"), sel);
- wxLogMessage(_T("Combobox GetValue(): %s"), m_combobox->GetValue().c_str() );
+ wxLogMessage(wxT("Combobox GetValue(): %s"), m_combobox->GetValue().c_str() );
}
void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
CreateCombo();
}
+void ComboboxWidgetsPage::OnDropdown(wxCommandEvent& WXUNUSED(event))
+{
+ wxLogMessage(wxT("Combobox dropped down"));
+}
+
+void ComboboxWidgetsPage::OnCloseup(wxCommandEvent& WXUNUSED(event))
+{
+ wxLogMessage(wxT("Combobox closed up"));
+}
+
#endif //wxUSE_COMBOBOX
#endif
projects / wxWidgets.git / blobdiff