// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-/*
- TODO:
-
- +1. typing in the text should select the string in listbox
- +2. scrollbars in listbox are unusable
- +3. the initially selected item is not selected
- ?4. kbd interface (what does GTK do?)
- 5. there is still autoscrolling without scrollbars - but is it bad?
- */
-
// ============================================================================
// declarations
// ============================================================================
3. which passes them to the popup window if it is popped up
*/
+// constants
+// ----------------------------------------------------------------------------
+
+// the margin between the text control and the combo button
+static const wxCoord g_comboMargin = 2;
+
// ----------------------------------------------------------------------------
// wxComboButton is just a normal button except that it sends commands to the
// combobox and not its parent
wxComboButton(wxComboControl *combo)
: wxBitmapButton(combo->GetParent(), -1, wxNullBitmap,
wxDefaultPosition, wxDefaultSize,
- wxBORDER_NONE)
+ wxBORDER_NONE | wxBU_EXACTFIT)
{
m_combo = combo;
- wxBitmap bmpNormal, bmpPressed, bmpDisabled;
+ wxBitmap bmpNormal, bmpFocus, bmpPressed, bmpDisabled;
+
+ GetRenderer()->GetComboBitmaps(&bmpNormal,
+ &bmpFocus,
+ &bmpPressed,
+ &bmpDisabled);
- GetRenderer()->GetComboBitmaps(&bmpNormal, &bmpPressed, &bmpDisabled);
SetBitmapLabel(bmpNormal);
- SetBitmapFocus(bmpNormal);
- SetBitmapSelected(bmpPressed);
- SetBitmapDisabled(bmpDisabled);
+ SetBitmapFocus(bmpFocus.Ok() ? bmpFocus : bmpNormal);
+ SetBitmapSelected(bmpPressed.Ok() ? bmpPressed : bmpNormal);
+ SetBitmapDisabled(bmpDisabled.Ok() ? bmpDisabled : bmpNormal);
- SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());
+ SetBestSize(wxDefaultSize);
}
protected:
void OnButton(wxCommandEvent& event) { m_combo->ShowPopup(); }
- virtual wxSize DoGetBestSize() const { return GetSize(); }
+ virtual wxSize DoGetBestClientSize() const
+ {
+ const wxBitmap& bmp = GetBitmapLabel();
+
+ return wxSize(bmp.GetWidth(), bmp.GetHeight());
+
+ }
private:
wxComboControl *m_combo;
// filter mouse move events happening outside the list box
void OnMouseMove(wxMouseEvent& event);
+ // set m_clicked value from here
+ void OnLeftUp(wxMouseEvent& event);
+
// called whenever the user selects or activates a listbox item
void OnSelect(wxCommandEvent& event);
const wxString& strArg);
private:
+ // has the mouse been released on this control?
+ bool m_clicked;
+
DECLARE_EVENT_TABLE()
};
EVT_LISTBOX(-1, wxComboListBox::OnSelect)
EVT_LISTBOX_DCLICK(-1, wxComboListBox::OnSelect)
EVT_MOTION(wxComboListBox::OnMouseMove)
+ EVT_LEFT_UP(wxComboListBox::OnLeftUp)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxComboControl, wxControl)
EVT_TEXT(-1, wxComboTextCtrl::OnText)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl);
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
// ============================================================================
// implementation
m_heightPopup = size.y - DoGetBestSize().y;
}
- DoSetSize(pos.x, pos.y, size.x, size.y);
+ SetBestSize(size);
+ Move(pos);
// create the popup window immediately here to allow creating the controls
// with parent == GetPopupWindow() from the derived class ctor
wxSize sizeBtn = m_btn->GetBestSize(),
sizeText = m_text->GetBestSize();
- return wxSize(sizeBtn.x + sizeText.x, wxMax(sizeBtn.y, sizeText.y));
+ return wxSize(sizeText.x + g_comboMargin + sizeBtn.x, wxMax(sizeBtn.y, sizeText.y));
}
void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
width -= rectBorders.x + rectBorders.width;
height -= rectBorders.y + rectBorders.height;
- wxSize sizeBtn = m_btn->GetSize(),
- sizeText = m_text->GetSize();
+ wxSize sizeBtn = m_btn->GetBestSize();
wxCoord wText = width - sizeBtn.x;
- m_text->SetSize(x, y, wText, height);
- m_btn->SetSize(x + wText, y, -1, height);
+ wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
+ m_text->SetSize(x - p.x, y - p.y, wText, height);
+ m_btn->SetSize(x - p.x + wText, y - p.y, sizeBtn.x, height);
}
// ----------------------------------------------------------------------------
if (m_btn)
m_btn->Show(show);
-
+
if (m_text)
m_text->Show(show);
m_winPopup->PositionNearCombo();
// show it
+ m_popup->OnShow();
m_winPopup->Popup(m_text);
m_text->SelectAll();
m_popup->SetSelection(m_text->GetValue());
void wxComboListBox::OnSelect(wxCommandEvent& event)
{
- // first let the user code have the event
-
- // all fields are already filled by the listbox, just change the event
- // type and send it to the combo
- wxCommandEvent event2 = event;
- event2.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED);
- event2.SetEventObject(m_combo);
- event2.SetId(m_combo->GetId());
- m_combo->ProcessEvent(event2);
-
- // next update the combo and close the listbox
- m_combo->OnSelect(event.GetString());
+ if ( m_clicked )
+ {
+ // first update the combo and close the listbox
+ m_combo->OnSelect(event.GetString());
+
+ // next let the user code have the event
+
+ // all fields are already filled by the listbox, just change the event
+ // type and send it to the combo
+ wxCommandEvent event2 = event;
+ event2.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED);
+ event2.SetEventObject(m_combo);
+ event2.SetId(m_combo->GetId());
+ m_combo->ProcessEvent(event2);
+ }
+ //else: ignore the events resultign from just moving the mouse initially
}
void wxComboListBox::OnShow()
{
+ // nobody clicked us yet
+ m_clicked = FALSE;
}
bool wxComboListBox::PerformAction(const wxControlAction& action,
return wxListBox::PerformAction(action, numArg, strArg);
}
+void wxComboListBox::OnLeftUp(wxMouseEvent& event)
+{
+ // we should dismiss the combo now
+ m_clicked = TRUE;
+
+ event.Skip();
+}
+
void wxComboListBox::OnMouseMove(wxMouseEvent& event)
{
// while a wxComboListBox is shown, it always has capture, so if it doesn't
void wxComboBox::Clear()
{
GetLBox()->Clear();
+ GetText()->SetValue(wxEmptyString);
}
void wxComboBox::Delete(int n)
{
+ wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Delete") );
+
+ if (GetSelection() == n)
+ GetText()->SetValue(wxEmptyString);
+
GetLBox()->Delete(n);
}
wxString wxComboBox::GetString(int n) const
{
+ wxCHECK_MSG( (n >= 0) && (n < GetCount()), wxEmptyString, _T("invalid index in wxComboBox::GetString") );
+
return GetLBox()->GetString(n);
}
void wxComboBox::SetString(int n, const wxString& s)
{
+ wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::SetString") );
+
GetLBox()->SetString(n, s);
}
void wxComboBox::Select(int n)
{
- wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid combobox index") );
+ wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Select") );
GetLBox()->SetSelection(n);
GetText()->SetValue(GetLBox()->GetString(n));
int wxComboBox::GetSelection() const
{
+#if 1 // FIXME:: What is the correct behavior?
// if the current value isn't one of the listbox strings, return -1
+ return GetLBox()->GetSelection();
+#else
+ // Why oh why is this done this way?
+ // It is not because the value displayed in the text can be found
+ // in the list that it is the item that is selected!
return FindString(GetText()->GetValue());
+#endif
}
int wxComboBox::DoAppend(const wxString& item)
// input handling
// ----------------------------------------------------------------------------
-void wxComboControl::OnKey(wxCommandEvent& event)
+void wxComboControl::OnKey(wxKeyEvent& event)
{
if ( m_isPopupShown )
{
{
}
-bool wxStdComboBoxInputHandler::HandleKey(wxControl *control,
+bool wxStdComboBoxInputHandler::HandleKey(wxInputConsumer *consumer,
const wxKeyEvent& event,
bool pressed)
{
if ( !!action )
{
- control->PerformAction(action);
+ consumer->PerformAction(action);
return TRUE;
}
}
- return wxStdInputHandler::HandleKey(control, event, pressed);
+ return wxStdInputHandler::HandleKey(consumer, event, pressed);
}
#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff