#ifndef WX_PRECOMP
#include "wx/log.h"
+ #include "wx/bitmap.h"
#include "wx/button.h"
#include "wx/checkbox.h"
#include "wx/combobox.h"
#include "wx/sizer.h"
#include "widgets.h"
-
+#if 1
#include "icons/combobox.xpm"
// ----------------------------------------------------------------------------
{
ComboPage_Reset = 100,
ComboPage_CurText,
+ ComboPage_Insert,
+ ComboPage_InsertText,
ComboPage_Add,
ComboPage_AddText,
ComboPage_AddSeveral,
void OnButtonDelete(wxCommandEvent& event);
void OnButtonDeleteSel(wxCommandEvent& event);
void OnButtonClear(wxCommandEvent& event);
+ void OnButtonInsert(wxCommandEvent &event);
void OnButtonAdd(wxCommandEvent& event);
void OnButtonAddSeveral(wxCommandEvent& event);
void OnButtonAddMany(wxCommandEvent& event);
void OnUpdateUICurText(wxUpdateUIEvent& event);
+ void OnUpdateUIInsert(wxUpdateUIEvent& event);
void OnUpdateUIAddSeveral(wxUpdateUIEvent& event);
void OnUpdateUIClearButton(wxUpdateUIEvent& event);
void OnUpdateUIDeleteButton(wxUpdateUIEvent& event);
wxSizer *m_sizerCombo;
// the text entries for "Add/change string" and "Delete" buttons
- wxTextCtrl *m_textAdd,
+ wxTextCtrl *m_textInsert,
+ *m_textAdd,
*m_textChange,
*m_textDelete;
EVT_BUTTON(ComboPage_Delete, ComboboxWidgetsPage::OnButtonDelete)
EVT_BUTTON(ComboPage_DeleteSel, ComboboxWidgetsPage::OnButtonDeleteSel)
EVT_BUTTON(ComboPage_Clear, ComboboxWidgetsPage::OnButtonClear)
+ EVT_BUTTON(ComboPage_Insert, ComboboxWidgetsPage::OnButtonInsert)
EVT_BUTTON(ComboPage_Add, ComboboxWidgetsPage::OnButtonAdd)
EVT_BUTTON(ComboPage_AddSeveral, ComboboxWidgetsPage::OnButtonAddSeveral)
EVT_BUTTON(ComboPage_AddMany, ComboboxWidgetsPage::OnButtonAddMany)
+ 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_Reset, ComboboxWidgetsPage::OnUpdateUIResetButton)
+ EVT_UPDATE_UI(ComboPage_Insert, ComboboxWidgetsPage::OnUpdateUIInsert)
EVT_UPDATE_UI(ComboPage_AddSeveral, ComboboxWidgetsPage::OnUpdateUIAddSeveral)
EVT_UPDATE_UI(ComboPage_Clear, ComboboxWidgetsPage::OnUpdateUIClearButton)
EVT_UPDATE_UI(ComboPage_DeleteText, ComboboxWidgetsPage::OnUpdateUIClearButton)
EVT_COMBOBOX(ComboPage_Combo, ComboboxWidgetsPage::OnComboBox)
EVT_TEXT(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
+ EVT_TEXT_ENTER(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
EVT_CHECKBOX(-1, ComboboxWidgetsPage::OnCheckOrRadioBox)
EVT_RADIOBOX(-1, ComboboxWidgetsPage::OnCheckOrRadioBox)
wxImageList *imaglist)
: WidgetsPage(notebook)
{
- imaglist->Add(wxBitmap(combobox_xpm));
-
// init everything
m_chkSort =
m_chkReadonly = (wxCheckBox *)NULL;
m_combobox = (wxComboBox *)NULL;
m_sizerCombo = (wxSizer *)NULL;
+ imaglist->Add(wxBitmap(combobox_xpm));
+
/*
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
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+ sizerRow = CreateSizerWithTextAndButton(ComboPage_Insert,
+ _T("&Insert this string"),
+ ComboPage_InsertText,
+ &m_textInsert);
+ sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+
sizerRow = CreateSizerWithTextAndButton(ComboPage_Add,
_T("&Add this string"),
ComboPage_AddText,
&m_textAdd);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
- btn = new wxButton(this, ComboPage_AddSeveral, _T("&Insert a few strings"));
+ btn = new wxButton(this, ComboPage_AddSeveral, _T("&Append a few strings"));
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
- btn = new wxButton(this, ComboPage_AddMany, _T("Add &many strings"));
+ btn = new wxButton(this, ComboPage_AddMany, _T("Append &many strings"));
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(ComboPage_Change,
0, NULL,
0);
sizerRight->Add(m_combobox, 1, wxGROW | wxALL, 5);
- sizerRight->SetMinSize(250, 0);
+ sizerRight->SetMinSize(150, 0);
m_sizerCombo = sizerRight; // save it to modify it later
// the 3 panes panes compose the window
items.Add(m_combobox->GetString(n));
}
- m_sizerCombo->Remove(m_combobox);
+ m_sizerCombo->Detach( m_combobox );
delete m_combobox;
}
m_combobox->Clear();
}
+void ComboboxWidgetsPage::OnButtonInsert(wxCommandEvent& event)
+{
+ static unsigned int s_item = 0;
+
+ wxString s = m_textInsert->GetValue();
+ if ( !m_textInsert->IsModified() )
+ {
+ // update the default string
+ m_textInsert->SetValue(wxString::Format(_T("test item %u"), ++s_item));
+ }
+
+ if (m_combobox->GetSelection() >= 0)
+ m_combobox->Insert(s, m_combobox->GetSelection());
+}
+
void ComboboxWidgetsPage::OnButtonAdd(wxCommandEvent& event)
{
- static size_t s_item = 0;
+ static unsigned int s_item = 0;
wxString s = m_textAdd->GetValue();
if ( !m_textAdd->IsModified() )
void ComboboxWidgetsPage::OnButtonAddMany(wxCommandEvent& WXUNUSED(event))
{
// "many" means 1000 here
- for ( size_t n = 0; n < 1000; n++ )
+ for ( unsigned int n = 0; n < 1000; n++ )
{
m_combobox->Append(wxString::Format(_T("item #%u"), n));
}
void ComboboxWidgetsPage::OnUpdateUICurText(wxUpdateUIEvent& event)
{
- event.SetText( wxString::Format(_T("%d"), m_combobox->GetSelection()) );
+ if (m_combobox)
+ event.SetText( wxString::Format(_T("%d"), m_combobox->GetSelection()) );
}
void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
{
- event.Enable( m_chkSort->GetValue() || m_chkReadonly->GetValue() );
+ if (m_combobox)
+ event.Enable( m_chkSort->GetValue() || m_chkReadonly->GetValue() );
+}
+
+void ComboboxWidgetsPage::OnUpdateUIInsert(wxUpdateUIEvent& event)
+{
+ if (m_combobox)
+ {
+ bool enable = !(m_combobox->GetWindowStyle() & wxCB_SORT) &&
+ (m_combobox->GetSelection() >= 0);
+
+ event.Enable(enable);
+ }
}
void ComboboxWidgetsPage::OnUpdateUIDeleteButton(wxUpdateUIEvent& event)
{
- unsigned long n;
- event.Enable(m_textDelete->GetValue().ToULong(&n) &&
- (n < (unsigned)m_combobox->GetCount()));
+ if (m_combobox)
+ {
+ unsigned long n;
+ event.Enable(m_textDelete->GetValue().ToULong(&n) &&
+ (n < (unsigned)m_combobox->GetCount()));
+ }
}
void ComboboxWidgetsPage::OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event)
{
- event.Enable(m_combobox->GetSelection() != -1);
+ if (m_combobox)
+ event.Enable(m_combobox->GetSelection() != -1);
}
void ComboboxWidgetsPage::OnUpdateUIClearButton(wxUpdateUIEvent& event)
{
- event.Enable(m_combobox->GetCount() != 0);
+ if (m_combobox)
+ event.Enable(m_combobox->GetCount() != 0);
}
void ComboboxWidgetsPage::OnUpdateUIAddSeveral(wxUpdateUIEvent& event)
{
- event.Enable(!(m_combobox->GetWindowStyle() & wxCB_SORT));
+ if (m_combobox)
+ event.Enable(!(m_combobox->GetWindowStyle() & wxCB_SORT));
}
void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
{
+ if (!m_combobox)
+ return;
+
wxString s = event.GetString();
wxASSERT_MSG( s == m_combobox->GetValue(),
_T("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());
+ else
wxLogMessage(_T("Combobox text changed (now '%s')"), s.c_str());
}
void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
{
- int sel = event.GetInt();
+ long sel = event.GetInt();
m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
- wxLogMessage(_T("Combobox item %d selected"), sel);
+ wxLogMessage(_T("Combobox item %ld selected"), sel);
}
void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
#endif //wxUSE_COMBOBOX
+#endif
projects / wxWidgets.git / blobdiff