#define BMP_BUTTON_MARGIN 4
-#define DEFAULT_POPUP_HEIGHT 200
+#define DEFAULT_POPUP_HEIGHT 400
#define DEFAULT_TEXT_INDENT 3
{
public:
wxComboFrameEventHandler( wxComboCtrlBase* pCb );
- ~wxComboFrameEventHandler();
+ virtual ~wxComboFrameEventHandler();
void OnPopup();
{
wxWindow* winFocused = ::wxWindow::FindFocus();
- wxWindow* popup = m_combo->GetPopupControl();
+ wxWindow* popup = m_combo->GetPopupControl()->GetControl();
wxWindow* winpopup = m_combo->GetPopupWindow();
if (
{
if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl
{
- combo->DrawFocusBackground(dc,rect,0);
+ combo->PrepareBackground(dc,rect,0);
dc.DrawText( combo->GetValue(),
rect.x + combo->GetTextIndent(),
// ----------------------------------------------------------------------------
//
-// This is pushed to the event handler queue of either combo box
-// or its textctrl (latter if not readonly combo).
+// This is pushed to the event handler queue of the child textctrl.
//
class wxComboBoxExtraInputHandler : public wxEvtHandler
{
{
m_combo = combo;
}
- ~wxComboBoxExtraInputHandler() { }
+ virtual ~wxComboBoxExtraInputHandler() { }
void OnKey(wxKeyEvent& event);
void OnFocus(wxFocusEvent& event);
void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
{
- int keycode = event.GetKeyCode();
+ // Let the wxComboCtrl event handler have a go first.
+ wxComboCtrlBase* combo = m_combo;
+ wxObject* prevObj = event.GetEventObject();
- if ( keycode == WXK_TAB )
- {
- wxNavigationKeyEvent evt;
- evt.SetFlags(wxNavigationKeyEvent::FromTab|
- (!event.ShiftDown()?wxNavigationKeyEvent::IsForward:
- wxNavigationKeyEvent::IsBackward));
- evt.SetEventObject(m_combo);
- m_combo->GetParent()->GetEventHandler()->AddPendingEvent(evt);
- return;
- }
-
- if ( m_combo->IsPopupShown() )
- {
- // pass it to the popped up control
- m_combo->GetPopupControl()->GetControl()->AddPendingEvent(event);
- }
- else // no popup
- {
- int comboStyle = m_combo->GetWindowStyle();
- wxComboPopup* popupInterface = m_combo->GetPopupControl();
-
- if ( !popupInterface )
- {
- event.Skip();
- return;
- }
+ event.SetId(combo->GetId());
+ event.SetEventObject(combo);
+ combo->GetEventHandler()->ProcessEvent(event);
- if ( (comboStyle & wxCB_READONLY) ||
- ( keycode != WXK_RIGHT && keycode != WXK_LEFT )
- )
- {
- // Alternate keys: UP and DOWN show the popup instead of cycling
- if ( (comboStyle & wxCC_ALT_KEYS) )
- {
- if ( keycode == WXK_UP || keycode == WXK_DOWN )
- {
- m_combo->OnButtonClick();
- return;
- }
- else
- event.Skip();
- }
- else
- popupInterface->OnComboKeyEvent(event);
- }
- else
- event.Skip();
- }
+ event.SetId(((wxWindow*)prevObj)->GetId());
+ event.SetEventObject(prevObj);
}
void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
m_combo->SetSelection(-1,-1);
}
- if ( event.GetId() != m_combo->GetId() )
- {
- // Add textctrl set focus events as combo set focus events
- // NOTE: Simply changing the event and skipping didn't seem
- // to do the trick.
- wxFocusEvent evt2(wxEVT_SET_FOCUS,m_combo->GetId());
- evt2.SetEventObject(m_combo);
- m_combo->GetEventHandler()->ProcessEvent(evt2);
- }
- else
- event.Skip();
+ // Send focus indication to parent.
+ // NB: This is needed for cases where the textctrl gets focus
+ // instead of its parent. While this may trigger multiple
+ // wxEVT_SET_FOCUSes (since m_text->SetFocus is called
+ // from combo's focus event handler), they should be quite
+ // harmless.
+ wxFocusEvent evt2(wxEVT_SET_FOCUS,m_combo->GetId());
+ evt2.SetEventObject(m_combo);
+ m_combo->GetEventHandler()->ProcessEvent(evt2);
event.Skip();
}
m_combo = combo;
m_beenInside = false;
}
- ~wxComboPopupExtraEventHandler() { }
+ virtual ~wxComboPopupExtraEventHandler() { }
void OnMouseEvent( wxMouseEvent& event );
EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
//EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
+ EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
END_EVENT_TABLE()
m_text = (wxTextCtrl*) NULL;
m_popupInterface = (wxComboPopup*) NULL;
- m_extraEvtHandler = (wxEvtHandler*) NULL;
m_popupExtraHandler = (wxEvtHandler*) NULL;
m_textEvtHandler = (wxEvtHandler*) NULL;
m_btnState = 0;
m_btnWidDefault = 0;
m_blankButtonBg = false;
- m_btnWid = m_btnHei = 0;
+ m_ignoreEvtText = 0;
+ m_btnWid = m_btnHei = -1;
m_btnSide = wxRIGHT;
m_btnSpacingX = 0;
m_extRight = 0;
m_absIndent = -1;
m_iFlags = 0;
- m_downReceived = false;
m_timeCanAcceptClick = 0;
}
return true;
}
-void wxComboCtrlBase::InstallInputHandlers( bool alsoTextCtrl )
+void wxComboCtrlBase::InstallInputHandlers()
{
- if ( m_text && alsoTextCtrl )
+ if ( m_text )
{
m_textEvtHandler = new wxComboBoxExtraInputHandler(this);
m_text->PushEventHandler(m_textEvtHandler);
}
-
- wxComboBoxExtraInputHandler* inputHandler = new wxComboBoxExtraInputHandler(this);
- PushEventHandler(inputHandler);
- m_extraEvtHandler = inputHandler;
}
void
// navigation event is then sent to the wrong window.
style |= wxTE_PROCESS_TAB;
- if ( HasFlag(wxPROCESS_ENTER) )
+ if ( HasFlag(wxTE_PROCESS_ENTER) )
style |= wxTE_PROCESS_ENTER;
+ // Ignore EVT_TEXT generated by the constructor (but only
+ // if the event redirector already exists)
+ // NB: This must be " = 1" instead of "++";
+ if ( m_textEvtHandler )
+ m_ignoreEvtText = 1;
+ else
+ m_ignoreEvtText = 0;
+
m_text = new wxTextCtrl(this, wxID_ANY, m_valueString,
wxDefaultPosition, wxDefaultSize,
style, validator);
DestroyPopup();
- RemoveEventHandler(m_extraEvtHandler);
-
if ( m_text )
m_text->RemoveEventHandler(m_textEvtHandler);
delete m_textEvtHandler;
- delete m_extraEvtHandler;
}
if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
(m_bmpNormal.Ok() && m_blankButtonBg) ) &&
m_btnSpacingX == 0 &&
- m_btnHei == 0 )
+ m_btnHei <= 0 )
{
m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
btnBorder = 0;
int butHeight = sz.y - btnBorder*2;
// Adjust button width
- if ( m_btnWid < 0 )
- butWidth += m_btnWid;
- else if ( m_btnWid > 0 )
+ if ( m_btnWid > 0 )
butWidth = m_btnWid;
else
{
}
// Adjust button height
- if ( m_btnHei < 0 )
- butHeight += m_btnHei;
- else if ( m_btnHei > 0 )
+ if ( m_btnHei > 0 )
butHeight = m_btnHei;
// Use size of normal bitmap if...
// painting
// ----------------------------------------------------------------------------
-// draw focus background on area in a way typical on platform
-void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags ) const
+#if (!defined(__WXMSW__)) || defined(__WXUNIVERSAL__)
+// prepare combo box background on area in a way typical on platform
+void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
{
wxSize sz = GetClientSize();
bool isEnabled;
dc.SetBrush( bgCol );
dc.SetPen( bgCol );
dc.DrawRectangle( selRect );
+
+ // Don't clip exactly to the selection rectangle so we can draw
+ // to the non-selected area in front of it.
+ wxRect clipRect(rect.x,rect.y,
+ (selRect.x+selRect.width)-rect.x,rect.height);
+ dc.SetClippingRegion(clipRect);
+}
+#else
+// Save the library size a bit for platforms that re-implement this.
+void wxComboCtrlBase::PrepareBackground( wxDC&, const wxRect&, int ) const
+{
}
+#endif
void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
{
void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
{
- // Change event id and relay it forward
+ if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
+ {
+ if ( m_ignoreEvtText > 0 )
+ {
+ m_ignoreEvtText--;
+ return;
+ }
+ }
+
+ // Change event id, object and string before relaying it forward
event.SetId(GetId());
+ wxString s = event.GetString();
+ event.SetEventObject(this);
+ event.SetString(s);
event.Skip();
}
return true;
}
-// Conversion to double-clicks and some basic filtering
// returns true if event was consumed or filtered
-//bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event, bool isOnButtonArea )
bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
- int flags )
+ int WXUNUSED(flags) )
{
wxLongLong t = ::wxGetLocalTimeMillis();
int evtType = event.GetEventType();
- //
- // Generate our own double-clicks
- // (to allow on-focus dc-event on double-clicks instead of triple-clicks)
- if ( (m_windowStyle & wxCC_SPECIAL_DCLICK) &&
- !m_isPopupShown &&
- //!(handlerFlags & wxCC_MF_ON_BUTTON) )
- !(flags & wxCC_MF_ON_BUTTON) )
+#if !USE_TRANSIENT_POPUP
+ if ( m_isPopupShown &&
+ ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
{
- if ( evtType == wxEVT_LEFT_DOWN )
- {
- // Set value to avoid up-events without corresponding downs
- m_downReceived = true;
- }
- else if ( evtType == wxEVT_LEFT_DCLICK )
- {
- // We'll make our own double-clicks
- //evtType = 0;
- event.SetEventType(0);
- return true;
- }
- else if ( evtType == wxEVT_LEFT_UP )
- {
- if ( m_downReceived || m_timeLastMouseUp == 1 )
- {
- wxLongLong timeFromLastUp = (t-m_timeLastMouseUp);
-
- if ( timeFromLastUp < DOUBLE_CLICK_CONVERSION_TRESHOLD )
- {
- //type = wxEVT_LEFT_DCLICK;
- event.SetEventType(wxEVT_LEFT_DCLICK);
- m_timeLastMouseUp = 1;
- }
- else
- {
- m_timeLastMouseUp = t;
- }
-
- //m_downReceived = false;
- }
- }
+ HidePopup();
+ return true;
}
+#endif
// Filter out clicks on button immediately after popup dismiss (Windows like behaviour)
if ( evtType == wxEVT_LEFT_DOWN && t < m_timeCanAcceptClick )
event.Skip();
}
-void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& )
+void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
{
- // First click is the first part of double-click
- // Some platforms don't generate down-less mouse up-event
- // (Windows does, GTK+2 doesn't), so that's why we have
- // to do this.
- m_timeLastMouseUp = ::wxGetLocalTimeMillis();
+ if ( IsPopupShown() )
+ {
+ // pass it to the popped up control
+ GetPopupControl()->GetControl()->AddPendingEvent(event);
+ }
+ else // no popup
+ {
+ int keycode = event.GetKeyCode();
- if ( m_text )
+ if ( keycode == WXK_TAB )
+ {
+ wxNavigationKeyEvent evt;
+ evt.SetFlags(wxNavigationKeyEvent::FromTab|
+ (!event.ShiftDown() ? wxNavigationKeyEvent::IsForward
+ : wxNavigationKeyEvent::IsBackward));
+ evt.SetEventObject(this);
+ GetParent()->GetEventHandler()->AddPendingEvent(evt);
+ return;
+ }
+
+ if ( IsKeyPopupToggle(event) )
+ {
+ OnButtonClick();
+ return;
+ }
+
+ int comboStyle = GetWindowStyle();
+ wxComboPopup* popupInterface = GetPopupControl();
+
+ if ( !popupInterface )
+ {
+ event.Skip();
+ return;
+ }
+
+ if ( (comboStyle & wxCB_READONLY) ||
+ (keycode != WXK_RIGHT && keycode != WXK_LEFT) )
+ {
+ popupInterface->OnComboKeyEvent(event);
+ }
+ else
+ event.Skip();
+ }
+}
+
+void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
+{
+ if ( event.GetEventType() == wxEVT_SET_FOCUS )
{
- m_text->SetFocus();
+ if ( m_text && m_text != ::wxWindow::FindFocus() )
+ m_text->SetFocus();
}
- else
- // no need to check for m_widthCustomPaint - that
- // area never gets special handling when selected
- // (in writable mode, that is)
- Refresh();
+
+ Refresh();
}
void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
// Destroy popup window and the child control
void wxComboCtrlBase::DestroyPopup()
{
+ HidePopup();
+
if ( m_popup )
m_popup->RemoveEventHandler(m_popupExtraHandler);
delete m_popupExtraHandler;
- HidePopup();
-
delete m_popupInterface;
if ( m_winPopup )
m_winPopup->Destroy();
+ m_popupExtraHandler = (wxEvtHandler*) NULL;
m_popupInterface = (wxComboPopup*) NULL;
m_winPopup = (wxWindow*) NULL;
m_popup = (wxWindow*) NULL;
// If cursor not on dropdown button, then clear its state
// (technically not required by all ports, but do it for all just in case)
- if ( !m_btnArea.Inside(ScreenToClient(::wxGetMousePosition())) )
+ if ( !m_btnArea.Contains(ScreenToClient(::wxGetMousePosition())) )
m_btnState = 0;
// Return parent's tab traversal flag.
// ----------------------------------------------------------------------------
void wxComboCtrlBase::SetButtonPosition( int width, int height,
- int side, int spacingX )
+ int side, int spacingX )
{
m_btnWid = width;
m_btnHei = height;
RecalcAndRefresh();
}
+wxSize wxComboCtrlBase::GetButtonSize()
+{
+ if ( m_btnSize.x > 0 )
+ return m_btnSize;
+
+ wxSize retSize(m_btnWid,m_btnHei);
+
+ // Need to call CalculateAreas now if button size is
+ // is not explicitly specified.
+ if ( retSize.x <= 0 || retSize.y <= 0)
+ {
+ OnResize();
+
+ retSize = m_btnSize;
+ }
+
+ return retSize;
+}
+
void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
bool blankButtonBg,
const wxBitmap& bmpPressed,
return m_valueString;
}
-void wxComboCtrlBase::SetValue(const wxString& value)
+void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
{
if ( m_text )
{
+ if ( !withEvent )
+ m_ignoreEvtText++;
+
m_text->SetValue(value);
if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
m_text->SelectAll();
}
}
+void wxComboCtrlBase::SetValue(const wxString& value)
+{
+ SetValueWithEvent(value, false);
+}
+
// In this SetValue variant wxComboPopup::SetStringValue is not called
void wxComboCtrlBase::SetText(const wxString& value)
{
m_valueString = value;
+ if ( m_text )
+ {
+ m_ignoreEvtText++;
+ m_text->SetValue( value );
+ }
+
Refresh();
}
projects / wxWidgets.git / blobdiff