#include "wx/combobox.h"
#ifndef WX_PRECOMP
+ #include "wx/app.h"
#include "wx/log.h"
#include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/dialog.h"
#include "wx/timer.h"
+ #include "wx/textctrl.h"
#endif
#include "wx/tooltip.h"
// constants
// ----------------------------------------------------------------------------
-// Milliseconds to wait for two mouse-ups after focus inorder
-// to trigger a double-click.
-#define DOUBLE_CLICK_CONVERSION_TRESHOLD 500
-
#define DEFAULT_DROPBUTTON_WIDTH 19
#define BMP_BUTTON_MARGIN 4
#if defined(__WXMSW__)
#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+ // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window.
+#define TEXTCTRL_TEXT_CENTERED 0 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING 0 // No focus ring on wxMSW
//#undef wxUSE_POPUPWIN
//#define wxUSE_POPUPWIN 0
#elif defined(__WXGTK__)
+// NB: It is not recommended to use wxDialog as popup on wxGTK, because of
+// this bug: If wxDialog is hidden, its position becomes corrupt
+// between hide and next show, but without internal coordinates being
+// reflected (or something like that - atleast commenting out ->Hide()
+// seemed to eliminate the position change).
+
#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+ // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window.
+#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING 0 // No focus ring on wxGTK
#elif defined(__WXMAC__)
-#define USE_TRANSIENT_POPUP 0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common
+ // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window.
+#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING 3 // Reserve room for the textctrl's focus ring to display
+
+#undef DEFAULT_DROPBUTTON_WIDTH
+#define DEFAULT_DROPBUTTON_WIDTH 22
+#undef COMBO_MARGIN
+#define COMBO_MARGIN FOCUS_RING
#else
#define USE_TRANSIENT_POPUP 0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+ // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window.
+#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING 0
#endif
// Popupwin is really only supported on wxMSW (not WINCE) and wxGTK, regardless
// what the wxUSE_POPUPWIN says.
// FIXME: Why isn't wxUSE_POPUPWIN reliable any longer? (it was in wxW2.6.2)
-#if (!defined(__WXMSW__) && !defined(__WXGTK__)) || defined(__WXWINCE__)
+#if (!defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMAC__)) || defined(__WXWINCE__)
#undef wxUSE_POPUPWIN
#define wxUSE_POPUPWIN 0
#endif
#endif
-#if USE_TRANSIENT_POPUP
+// Define different types of popup windows
+enum
+{
+ POPUPWIN_NONE = 0,
+ POPUPWIN_WXPOPUPTRANSIENTWINDOW = 1,
+ POPUPWIN_WXPOPUPWINDOW = 2,
+ POPUPWIN_WXDIALOG = 3
+};
- #define wxComboPopupWindowBase wxPopupTransientWindow
- #define INSTALL_TOPLEV_HANDLER 0
+
+#if USE_TRANSIENT_POPUP
+ // wxPopupTransientWindow is implemented
+
+ #define wxComboPopupWindowBase wxPopupTransientWindow
+ #define PRIMARY_POPUP_TYPE POPUPWIN_WXPOPUPTRANSIENTWINDOW
+ #define USES_WXPOPUPTRANSIENTWINDOW 1
+
+ #if TRANSIENT_POPUPWIN_IS_PERFECT
+ //
+ #elif POPUPWIN_IS_PERFECT
+ #define wxComboPopupWindowBase2 wxPopupWindow
+ #define SECONDARY_POPUP_TYPE POPUPWIN_WXPOPUPWINDOW
+ #define USES_WXPOPUPWINDOW 1
+ #else
+ #define wxComboPopupWindowBase2 wxDialog
+ #define SECONDARY_POPUP_TYPE POPUPWIN_WXDIALOG
+ #define USES_WXDIALOG 1
+ #endif
#elif wxUSE_POPUPWIN
+ // wxPopupWindow (but not wxPopupTransientWindow) is properly implemented
- #define wxComboPopupWindowBase wxPopupWindow
- #define INSTALL_TOPLEV_HANDLER 1
+ #define wxComboPopupWindowBase wxPopupWindow
+ #define PRIMARY_POPUP_TYPE POPUPWIN_WXPOPUPWINDOW
+ #define USES_WXPOPUPWINDOW 1
+
+ #if !POPUPWIN_IS_PERFECT
+ #define wxComboPopupWindowBase2 wxDialog
+ #define SECONDARY_POPUP_TYPE POPUPWIN_WXDIALOG
+ #define USES_WXDIALOG 1
+ #endif
#else
+ // wxPopupWindow is not implemented
- #define wxComboPopupWindowBase wxDialog
- #define INSTALL_TOPLEV_HANDLER 0 // Doesn't need since can monitor active event
+ #define wxComboPopupWindowBase wxDialog
+ #define PRIMARY_POPUP_TYPE POPUPWIN_WXDIALOG
+ #define USES_WXDIALOG 1
#endif
+#ifndef USES_WXPOPUPTRANSIENTWINDOW
+ #define USES_WXPOPUPTRANSIENTWINDOW 0
+#endif
+
+#ifndef USES_WXPOPUPWINDOW
+ #define USES_WXPOPUPWINDOW 0
+#endif
+
+#ifndef USES_WXDIALOG
+ #define USES_WXDIALOG 0
+#endif
+
+
+#if USES_WXPOPUPWINDOW
+ #define INSTALL_TOPLEV_HANDLER 1
+#else
+ #define INSTALL_TOPLEV_HANDLER 0
+#endif
+
//
// ** TODO **
#endif // INSTALL_TOPLEV_HANDLER
// ----------------------------------------------------------------------------
-// wxComboPopupWindow is wxPopupWindow customized for
+// wxComboPopupWindow is, in essence, wxPopupWindow customized for
// wxComboCtrl.
// ----------------------------------------------------------------------------
{
public:
- wxComboPopupWindow( wxComboCtrlBase *parent, int style = wxBORDER_NONE );
+ wxComboPopupWindow( wxComboCtrlBase *parent,
+ int style )
+ #if USES_WXPOPUPWINDOW || USES_WXPOPUPTRANSIENTWINDOW
+ : wxComboPopupWindowBase(parent,style)
+ #else
+ : wxComboPopupWindowBase(parent,
+ wxID_ANY,
+ wxEmptyString,
+ wxPoint(-21,-21),
+ wxSize(20,20),
+ style)
+ #endif
+ {
+ m_inShow = 0;
+ }
-#if USE_TRANSIENT_POPUP
+#if USES_WXPOPUPTRANSIENTWINDOW
+ virtual bool Show( bool show );
virtual bool ProcessLeftDown(wxMouseEvent& event);
+protected:
+ virtual void OnDismiss();
#endif
- void OnKeyEvent(wxKeyEvent& event);
+private:
+ wxByte m_inShow;
+};
- void OnMouseEvent( wxMouseEvent& event );
-#if !wxUSE_POPUPWIN
- void OnActivate( wxActivateEvent& event );
-#endif
-protected:
+#if USES_WXPOPUPTRANSIENTWINDOW
+bool wxComboPopupWindow::Show( bool show )
+{
+ // Guard against recursion
+ if ( m_inShow )
+ return wxComboPopupWindowBase::Show(show);
-#if USE_TRANSIENT_POPUP
- virtual void OnDismiss();
+ m_inShow++;
+
+ wxASSERT( IsKindOf(CLASSINFO(wxPopupTransientWindow)) );
+
+ wxPopupTransientWindow* ptw = (wxPopupTransientWindow*) this;
+
+ if ( show != ptw->IsShown() )
+ {
+ if ( show )
+ // We used to do wxPopupTransientWindow::Popup here,
+ // but this would hide normal Show, which we are
+ // also going to need.
+ ptw->Show();
+ else
+ ptw->Dismiss();
+ }
+
+ m_inShow--;
+
+ return true;
+}
+
+bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event)
+{
+ return wxPopupTransientWindow::ProcessLeftDown(event);
+}
+
+// First thing that happens when a transient popup closes is that this method gets called.
+void wxComboPopupWindow::OnDismiss()
+{
+ wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
+ wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
+ wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
+
+ combo->OnPopupDismiss();
+}
+#endif // USES_WXPOPUPTRANSIENTWINDOW
+
+
+// ----------------------------------------------------------------------------
+// wxComboPopupWindowEvtHandler does bulk of the custom event handling
+// of a popup window. It is separate so we can have different types
+// of popup windows.
+// ----------------------------------------------------------------------------
+
+class wxComboPopupWindowEvtHandler : public wxEvtHandler
+{
+public:
+
+ wxComboPopupWindowEvtHandler( wxComboCtrlBase *parent )
+ {
+ m_combo = parent;
+ }
+
+ void OnSizeEvent( wxSizeEvent& event );
+ void OnKeyEvent(wxKeyEvent& event);
+#if USES_WXDIALOG
+ void OnActivate( wxActivateEvent& event );
#endif
private:
+ wxComboCtrlBase* m_combo;
+
DECLARE_EVENT_TABLE()
};
-BEGIN_EVENT_TABLE(wxComboPopupWindow, wxComboPopupWindowBase)
- EVT_MOUSE_EVENTS(wxComboPopupWindow::OnMouseEvent)
-#if !wxUSE_POPUPWIN
- EVT_ACTIVATE(wxComboPopupWindow::OnActivate)
+BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
+ EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent)
+ EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent)
+#if USES_WXDIALOG
+ EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
#endif
- EVT_KEY_DOWN(wxComboPopupWindow::OnKeyEvent)
- EVT_KEY_UP(wxComboPopupWindow::OnKeyEvent)
+ EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)
END_EVENT_TABLE()
-wxComboPopupWindow::wxComboPopupWindow( wxComboCtrlBase *parent,
- int style )
-#if wxUSE_POPUPWIN
- : wxComboPopupWindowBase(parent,style)
-#else
- : wxComboPopupWindowBase(parent,
- wxID_ANY,
- wxEmptyString,
- wxPoint(-21,-21),
- wxSize(20,20),
- style)
-#endif
+void wxComboPopupWindowEvtHandler::OnSizeEvent( wxSizeEvent& WXUNUSED(event) )
{
+ // Block the event so that the popup control does not get auto-resized.
}
-void wxComboPopupWindow::OnKeyEvent( wxKeyEvent& event )
+void wxComboPopupWindowEvtHandler::OnKeyEvent( wxKeyEvent& event )
{
// Relay keyboard event to the main child controls
- // (just skipping may just cause the popup to close)
- wxWindowList children = GetChildren();
+ wxWindowList children = m_combo->GetPopupWindow()->GetChildren();
wxWindowList::iterator node = children.begin();
wxWindow* child = (wxWindow*)*node;
child->AddPendingEvent(event);
}
-void wxComboPopupWindow::OnMouseEvent( wxMouseEvent& event )
-{
- event.Skip();
-}
-
-#if !wxUSE_POPUPWIN
-void wxComboPopupWindow::OnActivate( wxActivateEvent& event )
+#if USES_WXDIALOG
+void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event )
{
if ( !event.GetActive() )
{
// Tell combo control that we are dismissed.
- wxComboCtrl* combo = (wxComboCtrl*) GetParent();
- wxASSERT( combo );
- wxASSERT( combo->IsKindOf(CLASSINFO(wxComboCtrl)) );
-
- combo->HidePopup();
+ m_combo->HidePopup();
event.Skip();
}
}
#endif
-#if USE_TRANSIENT_POPUP
-bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event )
-{
- return wxComboPopupWindowBase::ProcessLeftDown(event);
-}
-#endif
-
-#if USE_TRANSIENT_POPUP
-// First thing that happens when a transient popup closes is that this method gets called.
-void wxComboPopupWindow::OnDismiss()
-{
- wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
- wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
- wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
-
- combo->OnPopupDismiss();
-}
-#endif
// ----------------------------------------------------------------------------
// wxComboPopup
BEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler)
EVT_KEY_DOWN(wxComboBoxExtraInputHandler::OnKey)
EVT_SET_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
+ EVT_KILL_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
END_EVENT_TABLE()
{
// FIXME: This code does run when control is clicked,
// yet on Windows it doesn't select all the text.
- if ( !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) )
+ if ( event.GetEventType() == wxEVT_SET_FOCUS &&
+ !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) )
{
if ( m_combo->GetTextCtrl() )
m_combo->GetTextCtrl()->SelectAll();
// 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());
+ wxFocusEvent evt2(event.GetEventType(),m_combo->GetId());
evt2.SetEventObject(m_combo);
m_combo->GetEventHandler()->ProcessEvent(evt2);
wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize();
int evtType = event.GetEventType();
bool isInside = pt.x >= 0 && pt.y >= 0 && pt.x < sz.x && pt.y < sz.y;
+ bool relayToButton = false;
+
+ event.Skip();
if ( evtType == wxEVT_MOTION ||
evtType == wxEVT_LEFT_DOWN ||
evtType == wxEVT_RIGHT_DOWN )
{
// Block motion and click events outside the popup
- if ( !isInside )
+ if ( !isInside || !m_combo->IsPopupShown() )
{
event.Skip(false);
- return;
}
}
else if ( evtType == wxEVT_LEFT_UP )
{
- // Don't let left-down events in if outside
- if ( evtType == wxEVT_LEFT_DOWN )
+ if ( !m_combo->IsPopupShown() )
{
- if ( !isInside )
- return;
+ event.Skip(false);
+ relayToButton = true;
}
-
- if ( !m_beenInside )
+ else if ( !m_beenInside )
{
if ( isInside )
{
}
else
{
- //
- // Some mouse events to popup that happen outside it, before cursor
- // has been inside the popu, need to be ignored by it but relayed to
- // the dropbutton.
- //
- wxWindow* btn = m_combo->GetButton();
- if ( btn )
- btn->GetEventHandler()->AddPendingEvent(event);
- else
- m_combo->GetEventHandler()->AddPendingEvent(event);
-
- return;
+ relayToButton = true;
}
-
- event.Skip();
}
}
- event.Skip();
+ if ( relayToButton )
+ {
+ //
+ // Some mouse events to popup that happen outside it, before cursor
+ // has been inside the popup, need to be ignored by it but relayed to
+ // the dropbutton.
+ //
+ wxWindow* eventSink = m_combo;
+ wxWindow* btn = m_combo->GetButton();
+ if ( btn )
+ eventSink = btn;
+
+ eventSink->GetEventHandler()->ProcessEvent(event);
+ }
}
+// ----------------------------------------------------------------------------
+// wxComboCtrlTextCtrl
+// ----------------------------------------------------------------------------
+
+class wxComboCtrlTextCtrl : public wxTextCtrl
+{
+public:
+ wxComboCtrlTextCtrl() : wxTextCtrl() { }
+ virtual ~wxComboCtrlTextCtrl() { }
+
+ virtual wxWindow *GetMainWindowOfCompositeControl()
+ {
+ wxComboCtrl* combo = (wxComboCtrl*) GetParent();
+
+ // Returning this instead of just 'parent' lets FindFocus work
+ // correctly even when parent control is a child of a composite
+ // generic control (as is case with wxGenericDatePickerCtrl).
+ return combo->GetMainWindowOfCompositeControl();
+ }
+};
+
// ----------------------------------------------------------------------------
// wxComboCtrlBase
// ----------------------------------------------------------------------------
EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
+ EVT_IDLE(wxComboCtrlBase::OnIdleEvent)
//EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
void wxComboCtrlBase::Init()
{
- m_winPopup = (wxWindow *)NULL;
- m_popup = (wxWindow *)NULL;
- m_isPopupShown = false;
- m_btn = (wxWindow*) NULL;
- m_text = (wxTextCtrl*) NULL;
- m_popupInterface = (wxComboPopup*) NULL;
+ m_winPopup = NULL;
+ m_popup = NULL;
+ m_popupWinState = Hidden;
+ m_btn = NULL;
+ m_text = NULL;
+ m_popupInterface = NULL;
- m_popupExtraHandler = (wxEvtHandler*) NULL;
- m_textEvtHandler = (wxEvtHandler*) NULL;
+ m_popupExtraHandler = NULL;
+ m_textEvtHandler = NULL;
#if INSTALL_TOPLEV_HANDLER
- m_toplevEvtHandler = (wxEvtHandler*) NULL;
+ m_toplevEvtHandler = NULL;
#endif
+ m_mainCtrlWnd = this;
+
m_heightPopup = -1;
m_widthMinPopup = -1;
m_anchorSide = 0;
m_btnWidDefault = 0;
m_blankButtonBg = false;
m_ignoreEvtText = 0;
+ m_popupWinType = POPUPWIN_NONE;
m_btnWid = m_btnHei = -1;
m_btnSide = wxRIGHT;
m_btnSpacingX = 0;
m_absIndent = -1;
m_iFlags = 0;
m_timeCanAcceptClick = 0;
+
+ m_resetFocus = false;
}
bool wxComboCtrlBase::Create(wxWindow *parent,
{
if ( !(m_windowStyle & wxCB_READONLY) )
{
+ if ( m_text )
+ m_text->Destroy();
+
// wxTE_PROCESS_TAB is needed because on Windows, wxTAB_TRAVERSAL is
// not used by the wxPropertyGrid and therefore the tab is processed by
// looking at ancestors to see if they have wxTAB_TRAVERSAL. The
else
m_ignoreEvtText = 0;
- m_text = new wxTextCtrl(this, wxID_ANY, m_valueString,
- wxDefaultPosition, wxDefaultSize,
- style, validator);
-
- // This is required for some platforms (GTK+ atleast)
- m_text->SetSizeHints(2,4);
+ m_text = new wxComboCtrlTextCtrl();
+ m_text->Create(this, wxID_ANY, m_valueString,
+ wxDefaultPosition, wxSize(10,-1),
+ style, validator);
}
}
void wxComboCtrlBase::OnThemeChange()
{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ // Leave the default bg on the Mac so the area used by the focus ring will
+ // be the correct colour and themed brush. Instead we'll use
+ // wxSYS_COLOUR_WINDOW in the EVT_PAINT handler as needed.
+#ifndef __WXMAC__
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
}
wxComboCtrlBase::~wxComboCtrlBase()
#if INSTALL_TOPLEV_HANDLER
delete ((wxComboFrameEventHandler*)m_toplevEvtHandler);
- m_toplevEvtHandler = (wxEvtHandler*) NULL;
+ m_toplevEvtHandler = NULL;
#endif
DestroyPopup();
m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
btnBorder = 0;
}
+ else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) &&
+ m_btnSpacingX == 0 && !m_bmpNormal.Ok() )
+ {
+ m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
+ btnBorder = 0;
+ }
else
{
m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
{
int newY = butHeight+(customBorder*2);
SetClientSize(wxDefaultCoord,newY);
+ if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )
+ m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+ else
+ m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+
sz.y = newY;
}
}
m_btnSize.y = butHeight;
m_btnArea.x = ( m_btnSide==wxRIGHT ? sz.x - butAreaWid - btnBorder : btnBorder );
- m_btnArea.y = btnBorder;
+ m_btnArea.y = btnBorder + FOCUS_RING;
m_btnArea.width = butAreaWid;
- m_btnArea.height = sz.y - (btnBorder*2);
+ m_btnArea.height = sz.y - ((btnBorder+FOCUS_RING)*2);
- m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder;
- m_tcArea.y = customBorder;
- m_tcArea.width = sz.x - butAreaWid - (customBorder*2);
- m_tcArea.height = sz.y - (customBorder*2);
+ m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder + FOCUS_RING;
+ m_tcArea.y = customBorder + FOCUS_RING;
+ m_tcArea.width = sz.x - butAreaWid - (customBorder*2) - (FOCUS_RING*2);
+ m_tcArea.height = sz.y - ((customBorder+FOCUS_RING)*2);
/*
if ( m_text )
if ( !m_text )
return;
+#if !TEXTCTRL_TEXT_CENTERED
+
wxSize sz = GetClientSize();
- int customBorder = m_widthCustomBorder;
+ int customBorder = m_widthCustomBorder;
if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
{
// Centre textctrl
}
}
else
+#else // TEXTCTRL_TEXT_CENTERED
+ wxUnusedVar(textCtrlXAdjust);
+ wxUnusedVar(textCtrlYAdjust);
+#endif // !TEXTCTRL_TEXT_CENTERED/TEXTCTRL_TEXT_CENTERED
{
- m_text->SetSize( m_tcArea.x,
- 0,
- sz.x - m_btnArea.x - m_widthCustomPaint - customBorder,
- sz.y );
+ // If it has border, have textctrl will the entire text field.
+ m_text->SetSize( m_tcArea.x + m_widthCustomPaint,
+ m_tcArea.y,
+ m_tcArea.width - m_widthCustomPaint,
+ m_tcArea.height );
}
}
fhei += 1;
#endif
- wxSize ret(sizeText.x + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH,
- fhei);
+#ifdef __WXMAC__
+ // these are the numbers from the HIG:
+ switch ( m_windowVariant )
+ {
+ case wxWINDOW_VARIANT_NORMAL:
+ default :
+ fhei = 22;
+ break;
+ case wxWINDOW_VARIANT_SMALL:
+ fhei = 19;
+ break;
+ case wxWINDOW_VARIANT_MINI:
+ fhei = 15;
+ break;
+ }
+#endif
+
+ fhei += 2 * FOCUS_RING;
+ int width = sizeText.x + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;
+ wxSize ret(width, fhei);
CacheBestSize(ret);
return ret;
}
m_btn->Enable(enable);
if ( m_text )
m_text->Enable(enable);
+
+ Refresh();
return true;
}
}
else
{
- if ( m_text ) m_text->SetToolTip( (wxToolTip*) NULL );
- if ( m_btn ) m_btn->SetToolTip( (wxToolTip*) NULL );
+ if ( m_text ) m_text->SetToolTip( NULL );
+ if ( m_btn ) m_btn->SetToolTip( NULL );
}
}
#endif // wxUSE_TOOLTIPS
+#if wxUSE_VALIDATORS
+void wxComboCtrlBase::SetValidator(const wxValidator& validator)
+{
+ wxTextCtrl* textCtrl = GetTextCtrl();
+
+ if ( textCtrl )
+ textCtrl->SetValidator( validator );
+ else
+ wxControl::SetValidator( validator );
+}
+
+wxValidator* wxComboCtrlBase::GetValidator()
+{
+ wxTextCtrl* textCtrl = GetTextCtrl();
+
+ return textCtrl ? textCtrl->GetValidator() : wxControl::GetValidator();
+}
+#endif // wxUSE_VALIDATORS
+
// ----------------------------------------------------------------------------
// painting
// ----------------------------------------------------------------------------
{
wxSize sz = GetClientSize();
bool isEnabled;
- bool isFocused; // also selected
+ bool doDrawFocusRect; // also selected
// For smaller size control (and for disabled background) use less spacing
int focusSpacingX;
{
// Drawing control
isEnabled = IsEnabled();
- isFocused = ShouldDrawFocus();
+ doDrawFocusRect = ShouldDrawFocus() && !(m_iFlags & wxCC_FULL_BUTTON);
// Windows-style: for smaller size control (and for disabled background) use less spacing
focusSpacingX = isEnabled ? 2 : 1;
{
// Drawing a list item
isEnabled = true; // they are never disabled
- isFocused = flags & wxCONTROL_SELECTED ? true : false;
+ doDrawFocusRect = (flags & wxCONTROL_SELECTED) != 0;
focusSpacingX = 0;
focusSpacingY = 0;
selRect.width -= wcp + (focusSpacingX*2);
wxColour bgCol;
+ bool doDrawSelRect = true;
if ( isEnabled )
{
// If popup is hidden and this control is focused,
// then draw the focus-indicator (selbgcolor background etc.).
- if ( isFocused )
+ if ( doDrawFocusRect )
{
dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
else
{
dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
+#ifndef __WXMAC__ // see note in OnThemeChange
+ doDrawSelRect = false;
bgCol = GetBackgroundColour();
+#else
+ bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
}
}
else
{
dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT) );
+#ifndef __WXMAC__ // see note in OnThemeChange
bgCol = GetBackgroundColour();
+#else
+ bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
}
dc.SetBrush( bgCol );
- dc.SetPen( bgCol );
- dc.DrawRectangle( selRect );
+ if ( doDrawSelRect )
+ {
+ 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.
}
#endif
-void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
+void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
{
int drawState = m_btnState;
-#ifdef __WXGTK__
- if ( m_isPopupShown )
+ if ( (m_iFlags & wxCC_BUTTON_STAYS_DOWN) &&
+ GetPopupWindowState() >= Animating )
drawState |= wxCONTROL_PRESSED;
-#endif
wxRect drawRect(rect.x+m_btnSpacingX,
rect.y+((rect.height-m_btnSize.y)/2),
if ( !m_bmpNormal.Ok() )
{
+ if ( flags & Button_BitmapOnly )
+ return;
+
// Need to clear button background even if m_btn is present
- if ( paintBg )
+ if ( flags & Button_PaintBackground )
{
wxColour bgCol;
{
// If using blank button background, we need to clear its background
// with button face colour instead of colour for rest of the control.
- if ( paintBg )
+ if ( flags & Button_PaintBackground )
{
wxColour bgCol = GetParent()->GetBackgroundColour(); //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
//wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
dc.DrawRectangle(rect);
}
- wxRendererNative::Get().DrawPushButton(this,
- dc,
- drawRect,
- drawState);
-
+ if ( !(flags & Button_BitmapOnly) )
+ {
+ wxRendererNative::Get().DrawPushButton(this,
+ dc,
+ drawRect,
+ drawState);
+ }
}
else
{
// Need to clear button background even if m_btn is present
// (assume non-button background was cleared just before this call so brushes are good)
- if ( paintBg )
+ if ( flags & Button_PaintBackground )
dc.DrawRectangle(rect);
}
// call if cursor is on button area or mouse is captured for the button
bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
- int flags )
+ int flags )
{
int type = event.GetEventType();
if ( type == wxEVT_MOTION )
{
- if ( flags & wxCC_MF_ON_BUTTON )
+ if ( (flags & wxCC_MF_ON_BUTTON) &&
+ IsPopupWindowState(Hidden) )
{
if ( !(m_btnState & wxCONTROL_CURRENT) )
{
Refresh();
}
}
- else if ( type == wxEVT_LEFT_DOWN )
+ else if ( type == wxEVT_LEFT_DOWN || type == wxEVT_LEFT_DCLICK )
{
if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
{
m_btnState &= ~(wxCONTROL_CURRENT);
// Mouse hover ends
- if ( !m_isPopupShown )
+ if ( IsPopupWindowState(Hidden) )
{
m_btnState &= ~(wxCONTROL_PRESSED);
Refresh();
else
return false;
+ // Never have 'hot' state when popup is being shown
+ // (this is mostly needed because of the animation).
+ if ( !IsPopupWindowState(Hidden) )
+ m_btnState &= ~wxCONTROL_CURRENT;
+
return true;
}
wxLongLong t = ::wxGetLocalTimeMillis();
int evtType = event.GetEventType();
-#if !USE_TRANSIENT_POPUP
- if ( m_isPopupShown &&
- ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
+#if USES_WXPOPUPWINDOW || USES_WXDIALOG
+ if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW )
{
- HidePopup();
- return true;
+ if ( IsPopupWindowState(Visible) &&
+ ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
+ {
+ HidePopup();
+ return true;
+ }
}
#endif
- // Filter out clicks on button immediately after popup dismiss (Windows like behaviour)
+ // Filter out clicks on button immediately after popup dismiss
if ( evtType == wxEVT_LEFT_DOWN && t < m_timeCanAcceptClick )
{
event.SetEventType(0);
if ( (evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_LEFT_DCLICK) &&
(m_windowStyle & wxCB_READONLY) )
{
- if ( m_isPopupShown )
+ if ( GetPopupWindowState() >= Animating )
{
- #if !wxUSE_POPUPWIN
- // Normally do nothing - evt handler should close it for us
- #elif !USE_TRANSIENT_POPUP
+ #if USES_WXPOPUPWINDOW
// Click here always hides the popup.
- HidePopup();
+ if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
+ HidePopup();
#endif
}
else
}
}
else
- if ( m_isPopupShown )
+ if ( IsPopupShown() )
{
// relay (some) mouse events to the popup
if ( evtType == wxEVT_MOUSEWHEEL )
- m_popup->AddPendingEvent(event);
+ m_popup->GetEventHandler()->AddPendingEvent(event);
}
else if ( evtType )
event.Skip();
}
else // no popup
{
- int keycode = event.GetKeyCode();
-
- if ( keycode == WXK_TAB )
- {
- wxNavigationKeyEvent evt;
- evt.SetFlags(wxNavigationKeyEvent::FromTab|
- (!event.ShiftDown() ? wxNavigationKeyEvent::IsForward
- : wxNavigationKeyEvent::IsBackward));
- evt.SetEventObject(this);
- GetParent()->GetEventHandler()->AddPendingEvent(evt);
+ if ( HandleAsNavigationKey(event) )
return;
- }
if ( IsKeyPopupToggle(event) )
{
return;
}
+ int keycode = event.GetKeyCode();
+
if ( (comboStyle & wxCB_READONLY) ||
(keycode != WXK_RIGHT && keycode != WXK_LEFT) )
{
{
if ( event.GetEventType() == wxEVT_SET_FOCUS )
{
- if ( m_text && m_text != ::wxWindow::FindFocus() )
- m_text->SetFocus();
+ wxWindow* tc = GetTextCtrl();
+ if ( tc && tc != DoFindFocus() )
+#ifdef __WXMAC__
+ m_resetFocus = true;
+#else
+ {
+ tc->SetFocus();
+ }
+#endif
}
Refresh();
}
+void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
+{
+ if ( m_resetFocus )
+ {
+ m_resetFocus = false;
+ wxWindow* tc = GetTextCtrl();
+ if ( tc )
+ tc->SetFocus();
+ }
+}
+
void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
OnThemeChange();
wxWindow* popup;
if ( !m_winPopup )
- m_winPopup = new wxComboPopupWindow( this, wxNO_BORDER );
+ {
+#ifdef wxComboPopupWindowBase2
+ if ( m_iFlags & wxCC_IFLAG_USE_ALT_POPUP )
+ {
+ #if !USES_WXDIALOG
+ m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER );
+ #else
+ m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY, wxEmptyString,
+ wxPoint(-21,-21), wxSize(20, 20),
+ wxNO_BORDER );
+ #endif
+ m_popupWinType = SECONDARY_POPUP_TYPE;
+ }
+ else
+#endif // wxComboPopupWindowBase2
+ {
+ m_winPopup = new wxComboPopupWindow( this, wxNO_BORDER );
+ m_popupWinType = PRIMARY_POPUP_TYPE;
+ }
+ m_popupWinEvtHandler = new wxComboPopupWindowEvtHandler(this);
+ m_winPopup->PushEventHandler(m_popupWinEvtHandler);
+ }
popupInterface->Create(m_winPopup);
m_popup = popup = popupInterface->GetControl();
delete m_popupInterface;
if ( m_winPopup )
+ {
+ m_winPopup->RemoveEventHandler(m_popupWinEvtHandler);
+ delete m_popupWinEvtHandler;
+ m_popupWinEvtHandler = NULL;
m_winPopup->Destroy();
+ }
- m_popupExtraHandler = (wxEvtHandler*) NULL;
- m_popupInterface = (wxComboPopup*) NULL;
- m_winPopup = (wxWindow*) NULL;
- m_popup = (wxWindow*) NULL;
+ m_popupExtraHandler = NULL;
+ m_popupInterface = NULL;
+ m_winPopup = NULL;
+ m_popup = NULL;
}
void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
}
else
{
- m_popup = (wxWindow*) NULL;
+ m_popup = NULL;
}
// This must be done after creation
void wxComboCtrlBase::ShowPopup()
{
EnsurePopupControl();
- wxCHECK_RET( !IsPopupShown(), wxT("popup window already shown") );
+ wxCHECK_RET( !IsPopupWindowState(Visible), wxT("popup window already shown") );
+
+ if ( IsPopupWindowState(Animating) )
+ return;
SetFocus();
popup = m_popup;
}
+ winPopup->Enable();
+
wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,
int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x;
int leftX = scrPos.x - m_extLeft;
+
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ leftX -= ctrlSz.x;
+
int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X );
// If there is not enough horizontal space, anchor on the other side.
else
popupX = 0;
+ int showFlags = CanDeferShow;
+
if ( spaceBelow < szp.y )
{
popupY = scrPos.y - szp.y;
+ showFlags |= ShowAbove;
}
- // Move to position
- //wxLogDebug(wxT("popup scheduled position1: %i,%i"),ptp.x,ptp.y);
- //wxLogDebug(wxT("popup position1: %i,%i"),winPopup->GetPosition().x,winPopup->GetPosition().y);
-
- // Some platforms (GTK) may need these two to be separate
- winPopup->SetSize( szp.x, szp.y );
- winPopup->Move( popupX, popupY );
-
- //wxLogDebug(wxT("popup position2: %i,%i"),winPopup->GetPosition().x,winPopup->GetPosition().y);
+#if INSTALL_TOPLEV_HANDLER
+ // Put top level window event handler into place
+ if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
+ {
+ if ( !m_toplevEvtHandler )
+ m_toplevEvtHandler = new wxComboFrameEventHandler(this);
- m_popup = popup;
+ wxWindow* toplev = ::wxGetTopLevelParent( this );
+ wxASSERT( toplev );
+ ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup();
+ toplev->PushEventHandler( m_toplevEvtHandler );
+ }
+#endif
// Set string selection (must be this way instead of SetStringSelection)
if ( m_text )
}
// This must be after SetStringValue
- m_isPopupShown = true;
+ m_popupWinState = Animating;
- // Show it
-#if USE_TRANSIENT_POPUP
- ((wxPopupTransientWindow*)winPopup)->Popup(popup);
-#else
- winPopup->Show();
-#endif
+ wxRect popupWinRect( popupX, popupY, szp.x, szp.y );
-#if INSTALL_TOPLEV_HANDLER
- // Put top level window event handler into place
- if ( !m_toplevEvtHandler )
- m_toplevEvtHandler = new wxComboFrameEventHandler(this);
+ m_popup = popup;
+ if ( (m_iFlags & wxCC_IFLAG_DISABLE_POPUP_ANIM) ||
+ AnimateShow( popupWinRect, showFlags ) )
+ {
+ DoShowPopup( popupWinRect, showFlags );
+ }
+}
+
+bool wxComboCtrlBase::AnimateShow( const wxRect& WXUNUSED(rect), int WXUNUSED(flags) )
+{
+ return true;
+}
+
+void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) )
+{
+ wxWindow* winPopup = m_winPopup;
+
+ if ( IsPopupWindowState(Animating) )
+ {
+ // Make sure the popup window is shown in the right position.
+ // Should not matter even if animation already did this.
+
+ // Some platforms (GTK) may like SetSize and Move to be separate
+ // (though the bug was probably fixed).
+ winPopup->SetSize( rect );
- wxWindow* toplev = ::wxGetTopLevelParent( this );
- wxASSERT( toplev );
- ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup();
- toplev->PushEventHandler( m_toplevEvtHandler );
+#if USES_WXPOPUPTRANSIENTWINDOW
+ if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
+ ((wxPopupTransientWindow*)winPopup)->Popup(m_popup);
+ else
#endif
+ winPopup->Show();
+
+ m_popupWinState = Visible;
+ }
+ else if ( IsPopupWindowState(Hidden) )
+ {
+ // Animation was aborted
+ wxASSERT( !winPopup->IsShown() );
+
+ m_popupWinState = Hidden;
+ }
+
+ Refresh();
}
void wxComboCtrlBase::OnPopupDismiss()
{
// Just in case, avoid double dismiss
- if ( !m_isPopupShown )
+ if ( IsPopupWindowState(Hidden) )
return;
- // *Must* set this before focus etc.
- m_isPopupShown = false;
+ // This must be set before focus - otherwise there will be recursive
+ // OnPopupDismisses.
+ m_popupWinState = Hidden;
+
+ //SetFocus();
+ m_winPopup->Disable();
// Inform popup control itself
m_popupInterface->OnDismiss();
}
#endif
- m_timeCanAcceptClick = ::wxGetLocalTimeMillis() + 150;
+ m_timeCanAcceptClick = ::wxGetLocalTimeMillis();
+
+ if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
+ m_timeCanAcceptClick += 150;
// If cursor not on dropdown button, then clear its state
// (technically not required by all ports, but do it for all just in case)
// refresh control (necessary even if m_text)
Refresh();
-#if !wxUSE_POPUPWIN
SetFocus();
-#endif
-
}
void wxComboCtrlBase::HidePopup()
{
// Should be able to call this without popup interface
- //wxCHECK_RET( m_popupInterface, _T("no popup interface") );
- if ( !m_isPopupShown )
+ if ( IsPopupWindowState(Hidden) )
return;
// transfer value and show it in textctrl, if any
- SetValue( m_popupInterface->GetStringValue() );
+ if ( !IsPopupWindowState(Animating) )
+ SetValue( m_popupInterface->GetStringValue() );
-#if USE_TRANSIENT_POPUP
- ((wxPopupTransientWindow*)m_winPopup)->Dismiss();
-#else
m_winPopup->Hide();
-#endif
OnPopupDismiss();
}
m_ignoreEvtText++;
m_text->SetValue(value);
+
if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
m_text->SelectAll();
}
- m_valueString = value;
-
- Refresh();
-
// Since wxComboPopup may want to paint the combo as well, we need
// to set the string value here (as well as sometimes in ShowPopup).
- if ( m_valueString != value && m_popupInterface )
+ if ( m_valueString != value )
{
- m_popupInterface->SetStringValue(value);
+ m_valueString = value;
+
+ EnsurePopupControl();
+
+ if (m_popupInterface)
+ m_popupInterface->SetStringValue(value);
}
+
+ Refresh();
}
void wxComboCtrlBase::SetValue(const wxString& value)
projects / wxWidgets.git / blobdiff