/////////////////////////////////////////////////////////////////////////////
-// Name: combocmn.cpp
-// Purpose: wxComboControlBase
+// Name: src/common/combocmn.cpp
+// Purpose: wxComboCtrlBase
// Author: Jaakko Salli
// Modified by:
// Created: Apr-30-2006
#pragma hdrstop
#endif
-#if wxUSE_COMBOCONTROL
+#if wxUSE_COMBOCTRL
+
+#include "wx/combobox.h"
#ifndef WX_PRECOMP
- #include "wx/defs.h"
#include "wx/log.h"
- #include "wx/combobox.h"
#include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/dialog.h"
+ #include "wx/timer.h"
#endif
-#include "wx/dcbuffer.h"
#include "wx/tooltip.h"
-#include "wx/timer.h"
#include "wx/combo.h"
#define BMP_BUTTON_MARGIN 4
-#define DEFAULT_POPUP_HEIGHT 200
+#define DEFAULT_POPUP_HEIGHT 400
#define DEFAULT_TEXT_INDENT 3
#if defined(__WXMSW__)
#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TEXTCTRL_TEXT_CENTERED 0 // 1 if text in textctrl is vertically centered
//#undef wxUSE_POPUPWIN
//#define wxUSE_POPUPWIN 0
#elif defined(__WXGTK__)
#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
#elif defined(__WXMAC__)
#define USE_TRANSIENT_POPUP 0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
#else
#define USE_TRANSIENT_POPUP 0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
#endif
class wxComboFrameEventHandler : public wxEvtHandler
{
public:
- wxComboFrameEventHandler( wxComboControlBase* pCb );
- ~wxComboFrameEventHandler();
+ wxComboFrameEventHandler( wxComboCtrlBase* pCb );
+ virtual ~wxComboFrameEventHandler();
void OnPopup();
protected:
wxWindow* m_focusStart;
- wxComboControlBase* m_combo;
+ wxComboCtrlBase* m_combo;
private:
DECLARE_EVENT_TABLE()
EVT_CLOSE(wxComboFrameEventHandler::OnClose)
END_EVENT_TABLE()
-wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboControlBase* combo )
+wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboCtrlBase* combo )
: wxEvtHandler()
{
m_combo = combo;
{
wxWindow* winFocused = ::wxWindow::FindFocus();
- wxWindow* popup = m_combo->GetPopupControl();
+ wxWindow* popup = m_combo->GetPopupControl()->GetControl();
wxWindow* winpopup = m_combo->GetPopupWindow();
if (
// ----------------------------------------------------------------------------
// wxComboPopupWindow is wxPopupWindow customized for
-// wxComboControl.
+// wxComboCtrl.
// ----------------------------------------------------------------------------
class wxComboPopupWindow : public wxComboPopupWindowBase
{
public:
- wxComboPopupWindow( wxComboControlBase *parent, int style = wxBORDER_NONE );
+ wxComboPopupWindow( wxComboCtrlBase *parent, int style = wxBORDER_NONE );
#if USE_TRANSIENT_POPUP
virtual bool ProcessLeftDown(wxMouseEvent& event);
END_EVENT_TABLE()
-wxComboPopupWindow::wxComboPopupWindow( wxComboControlBase *parent,
+wxComboPopupWindow::wxComboPopupWindow( wxComboCtrlBase *parent,
int style )
#if wxUSE_POPUPWIN
: wxComboPopupWindowBase(parent,style)
if ( !event.GetActive() )
{
// Tell combo control that we are dismissed.
- wxComboControl* combo = (wxComboControl*) GetParent();
+ wxComboCtrl* combo = (wxComboCtrl*) GetParent();
wxASSERT( combo );
- wxASSERT( combo->IsKindOf(CLASSINFO(wxComboControl)) );
+ wxASSERT( combo->IsKindOf(CLASSINFO(wxComboCtrl)) );
combo->HidePopup();
// First thing that happens when a transient popup closes is that this method gets called.
void wxComboPopupWindow::OnDismiss()
{
- wxComboControlBase* combo = (wxComboControlBase*) GetParent();
- wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboControlBase)),
- wxT("parent might not be wxComboControl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
+ 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();
}
return wxSize(minWidth,prefHeight);
}
-void wxComboPopup::DefaultPaintComboControl( wxComboControlBase* combo,
+void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo,
wxDC& dc, const wxRect& rect )
{
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
{
public:
- wxComboBoxExtraInputHandler( wxComboControlBase* combo )
+ wxComboBoxExtraInputHandler( wxComboCtrlBase* combo )
: wxEvtHandler()
{
m_combo = combo;
}
- ~wxComboBoxExtraInputHandler() { }
+ virtual ~wxComboBoxExtraInputHandler() { }
void OnKey(wxKeyEvent& event);
void OnFocus(wxFocusEvent& event);
protected:
- wxComboControlBase* m_combo;
+ wxComboCtrlBase* m_combo;
private:
DECLARE_EVENT_TABLE()
void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
{
- int keycode = event.GetKeyCode();
-
- 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();
+ // Let the wxComboCtrl event handler have a go first.
+ wxComboCtrlBase* combo = m_combo;
+ wxObject* prevObj = event.GetEventObject();
- 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();
}
{
public:
- wxComboPopupExtraEventHandler( wxComboControlBase* combo )
+ wxComboPopupExtraEventHandler( wxComboCtrlBase* combo )
: wxEvtHandler()
{
m_combo = combo;
m_beenInside = false;
}
- ~wxComboPopupExtraEventHandler() { }
+ virtual ~wxComboPopupExtraEventHandler() { }
void OnMouseEvent( wxMouseEvent& event );
- // Called from wxComboControlBase::OnPopupDismiss
+ // Called from wxComboCtrlBase::OnPopupDismiss
void OnPopupDismiss()
{
m_beenInside = false;
}
protected:
- wxComboControlBase* m_combo;
+ wxComboCtrlBase* m_combo;
bool m_beenInside;
}
// ----------------------------------------------------------------------------
-// wxComboControlBase
+// wxComboCtrlBase
// ----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(wxComboControlBase, wxControl)
- EVT_TEXT(wxID_ANY,wxComboControlBase::OnTextCtrlEvent)
- EVT_SIZE(wxComboControlBase::OnSizeEvent)
- EVT_SET_FOCUS(wxComboControlBase::OnFocusEvent)
- EVT_KILL_FOCUS(wxComboControlBase::OnFocusEvent)
- //EVT_BUTTON(wxID_ANY,wxComboControlBase::OnButtonClickEvent)
- EVT_TEXT_ENTER(wxID_ANY,wxComboControlBase::OnTextCtrlEvent)
- EVT_SYS_COLOUR_CHANGED(wxComboControlBase::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
+ EVT_TEXT(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
+ EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
+ 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()
-IMPLEMENT_ABSTRACT_CLASS(wxComboControlBase, wxControl)
+IMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl)
-// Have global double buffer - should be enough for multiple combos
-static wxBitmap* gs_doubleBuffer = (wxBitmap*) NULL;
-
-void wxComboControlBase::Init()
+void wxComboCtrlBase::Init()
{
m_winPopup = (wxWindow *)NULL;
m_popup = (wxWindow *)NULL;
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;
}
-bool wxComboControlBase::Create(wxWindow *parent,
- wxWindowID id,
- const wxString& value,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxValidator& validator,
- const wxString& name)
+bool wxComboCtrlBase::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& value,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
{
if ( !wxControl::Create(parent,
id,
OnThemeChange();
m_absIndent = GetNativeTextIndent();
+ m_iFlags |= wxCC_IFLAG_CREATED;
+
+ // If x and y indicate valid size, wxSizeEvent won't be
+ // emitted automatically, so we need to add artifical one.
+ if ( size.x > 0 && size.y > 0 )
+ {
+ wxSizeEvent evt(size,GetId());
+ GetEventHandler()->AddPendingEvent(evt);
+ }
+
return true;
}
-void wxComboControlBase::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 wxComboControlBase::CreateTextCtrl( int extraStyle, const wxValidator& validator )
+void
+wxComboCtrlBase::CreateTextCtrl(int style, const wxValidator& validator)
{
if ( !(m_windowStyle & wxCB_READONLY) )
{
- m_text = new wxTextCtrl(this,
- 12345,
- m_valueString,
- wxDefaultPosition,
- wxDefaultSize,
- // 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 navigation event is then sent to
- // the wrong window.
- wxTE_PROCESS_TAB |
- wxTE_PROCESS_ENTER |
- extraStyle,
- validator);
+ 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
+ // navigation event is then sent to the wrong window.
+ style |= wxTE_PROCESS_TAB;
+
+ 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);
// This is required for some platforms (GTK+ atleast)
m_text->SetSizeHints(2,4);
}
}
-void wxComboControlBase::OnThemeChange()
+void wxComboCtrlBase::OnThemeChange()
{
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
}
-wxComboControlBase::~wxComboControlBase()
+wxComboCtrlBase::~wxComboCtrlBase()
{
if ( HasCapture() )
ReleaseMouse();
- delete gs_doubleBuffer;
- gs_doubleBuffer = (wxBitmap*) NULL;
-
#if INSTALL_TOPLEV_HANDLER
delete ((wxComboFrameEventHandler*)m_toplevEvtHandler);
m_toplevEvtHandler = (wxEvtHandler*) NULL;
#endif
- if ( m_popup )
- m_popup->RemoveEventHandler(m_popupExtraHandler);
-
- delete m_popupExtraHandler;
-
- HidePopup();
-
- delete m_popupInterface;
- delete m_winPopup;
-
- RemoveEventHandler(m_extraEvtHandler);
+ DestroyPopup();
if ( m_text )
m_text->RemoveEventHandler(m_textEvtHandler);
delete m_textEvtHandler;
- delete m_extraEvtHandler;
}
// ----------------------------------------------------------------------------
// Recalculates button and textctrl areas
-void wxComboControlBase::CalculateAreas( int btnWidth )
+void wxComboCtrlBase::CalculateAreas( int btnWidth )
{
wxSize sz = GetClientSize();
int customBorder = m_widthCustomBorder;
- bool buttonOutside;
int btnBorder; // border for button only
- if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || m_blankButtonBg ) &&
- m_btnSpacingX == 0 && m_btnWid == 0 && m_btnHei == 0 &&
- (!m_bmpNormal.Ok() || m_blankButtonBg) )
+ // check if button should really be outside the border: we'll do it it if
+ // its platform default or bitmap+pushbutton background is used, but not if
+ // there is vertical size adjustment or horizontal spacing.
+ if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
+ (m_bmpNormal.Ok() && m_blankButtonBg) ) &&
+ m_btnSpacingX == 0 &&
+ m_btnHei <= 0 )
{
- buttonOutside = true;
m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
btnBorder = 0;
}
else
{
- buttonOutside = false;
m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
btnBorder = customBorder;
}
if ( butWidth <= 0 )
return;
+ 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 width to match aspect ratio
+ // (but only if control is smaller than best size).
+ int bestHeight = GetBestSize().y;
+ int height = GetSize().y;
- int butHeight = sz.y;
-
- butHeight -= btnBorder*2;
+ if ( height < bestHeight )
+ {
+ // Make very small buttons square, as it makes
+ // them accommodate arrow image better and still
+ // looks decent.
+ if ( height > 18 )
+ butWidth = (height*butWidth)/bestHeight;
+ else
+ butWidth = butHeight;
+ }
+ }
// 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...
if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 )
{
int newY = butHeight+(customBorder*2);
- SetClientSize(-1,newY);
+ SetClientSize(wxDefaultCoord,newY);
sz.y = newY;
}
}
*/
}
-void wxComboControlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust )
+void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust )
{
if ( !m_text )
return;
wxSize sz = GetClientSize();
int customBorder = m_widthCustomBorder;
+#if !TEXTCTRL_TEXT_CENTERED
if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
{
// Centre textctrl
}
}
else
+#else
+ wxUnusedVar(textCtrlXAdjust);
+ wxUnusedVar(textCtrlYAdjust);
+#endif
{
- 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,
+ customBorder,
+ sz.x - m_btnArea.width - m_widthCustomPaint - customBorder,
+ sz.y-(customBorder*2) );
}
}
-wxSize wxComboControlBase::DoGetBestSize() const
+wxSize wxComboCtrlBase::DoGetBestSize() const
{
wxSize sizeText(150,0);
return ret;
}
-void wxComboControlBase::DoMoveWindow(int x, int y, int width, int height)
-{
- // SetSize is called last in create, so it marks the end of creation
- m_iFlags |= wxCC_IFLAG_CREATED;
-
- wxControl::DoMoveWindow(x, y, width, height);
-}
-
-void wxComboControlBase::OnSizeEvent( wxSizeEvent& event )
+void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
{
if ( !IsCreated() )
return;
- // defined by actual wxComboControls
+ // defined by actual wxComboCtrls
OnResize();
event.Skip();
// standard operations
// ----------------------------------------------------------------------------
-bool wxComboControlBase::Enable(bool enable)
+bool wxComboCtrlBase::Enable(bool enable)
{
if ( !wxControl::Enable(enable) )
return false;
return true;
}
-bool wxComboControlBase::Show(bool show)
+bool wxComboCtrlBase::Show(bool show)
{
if ( !wxControl::Show(show) )
return false;
return true;
}
-bool wxComboControlBase::SetFont ( const wxFont& font )
+bool wxComboCtrlBase::SetFont ( const wxFont& font )
{
if ( !wxControl::SetFont(font) )
return false;
}
#if wxUSE_TOOLTIPS
-void wxComboControlBase::DoSetToolTip(wxToolTip *tooltip)
+void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip)
{
wxControl::DoSetToolTip(tooltip);
// painting
// ----------------------------------------------------------------------------
-// draw focus background on area in a way typical on platform
-void wxComboControlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags )
+#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;
wxRect selRect(rect);
selRect.y += focusSpacingY;
selRect.height -= (focusSpacingY*2);
- selRect.x += m_widthCustomPaint + focusSpacingX;
- selRect.width -= m_widthCustomPaint + (focusSpacingX*2);
+
+ int wcp = 0;
+
+ if ( !(flags & wxCONTROL_ISSUBMENU) )
+ wcp += m_widthCustomPaint;
+
+ selRect.x += wcp + focusSpacingX;
+ selRect.width -= wcp + (focusSpacingX*2);
wxColour bgCol;
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 wxComboControlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
+void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
{
int drawState = m_btnState;
if ( !m_bmpNormal.Ok() )
{
// 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 )
+ {
+ wxColour bgCol;
+
+ if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
+ bgCol = GetParent()->GetBackgroundColour();
+ else
+ bgCol = GetBackgroundColour();
+
+ dc.SetBrush(bgCol);
+ dc.SetPen(bgCol);
dc.DrawRectangle(rect);
+ }
// Draw standard button
wxRendererNative::Get().DrawComboBoxDropButton(this,
}
}
-void wxComboControlBase::RecalcAndRefresh()
+void wxComboCtrlBase::RecalcAndRefresh()
{
if ( IsCreated() )
{
}
}
-wxBitmap& wxComboControlBase::GetBufferBitmap( const wxSize& sz ) const
-{
- // If size is larger, recalculate double buffer bitmap
- if ( !gs_doubleBuffer ||
- sz.x > gs_doubleBuffer->GetWidth() ||
- sz.y > gs_doubleBuffer->GetHeight() )
- {
- delete gs_doubleBuffer;
- gs_doubleBuffer = new wxBitmap(sz.x+25,sz.y);
- }
- return *gs_doubleBuffer;
-}
-
// ----------------------------------------------------------------------------
// miscellaneous event handlers
// ----------------------------------------------------------------------------
-void wxComboControlBase::OnTextCtrlEvent(wxCommandEvent& event)
+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();
}
// call if cursor is on button area or mouse is captured for the button
-bool wxComboControlBase::HandleButtonMouseEvent( wxMouseEvent& event,
+bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
int flags )
{
int type = event.GetEventType();
}
else if ( type == wxEVT_LEFT_DOWN )
{
- // Only accept event if it wasn't right after popup dismiss
- //if ( ::wxGetLocalTimeMillis() > m_timeCanClick )
+ if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
{
- // Need to test this, because it might be outside.
- if ( flags & wxCC_MF_ON_BUTTON )
- {
- m_btnState |= wxCONTROL_PRESSED;
- Refresh();
+ m_btnState |= wxCONTROL_PRESSED;
+ Refresh();
- if ( !(m_iFlags & wxCC_POPUP_ON_MOUSE_UP) )
- OnButtonClick();
- else
- // If showing popup now, do not capture mouse or there will be interference
- CaptureMouse();
- }
+ if ( !(m_iFlags & wxCC_POPUP_ON_MOUSE_UP) )
+ OnButtonClick();
+ else
+ // If showing popup now, do not capture mouse or there will be interference
+ CaptureMouse();
}
- /*else
- {
- m_btnState = 0;
- }*/
}
else if ( type == wxEVT_LEFT_UP )
{
// If mouse was inside, fire the click event.
if ( m_iFlags & wxCC_POPUP_ON_MOUSE_UP )
{
- if ( flags & wxCC_MF_ON_BUTTON )
+ if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
OnButtonClick();
}
return true;
}
-// Conversion to double-clicks and some basic filtering
// returns true if event was consumed or filtered
-//bool wxComboControlBase::PreprocessMouseEvent( wxMouseEvent& event, bool isOnButtonArea )
-bool wxComboControlBase::PreprocessMouseEvent( wxMouseEvent& event,
- int flags )
+bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
+ 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 )
return false;
}
-void wxComboControlBase::HandleNormalMouseEvent( wxMouseEvent& event )
+void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
{
int evtType = event.GetEventType();
event.Skip();
}
-void wxComboControlBase::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 wxComboControlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
OnThemeChange();
// indentation may also have changed
// ----------------------------------------------------------------------------
// Create popup window and the child control
-void wxComboControlBase::CreatePopup()
+void wxComboCtrlBase::CreatePopup()
{
wxComboPopup* popupInterface = m_popupInterface;
wxWindow* popup;
popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
}
-void wxComboControlBase::SetPopupControl( wxComboPopup* iface )
+// Destroy popup window and the child control
+void wxComboCtrlBase::DestroyPopup()
{
- wxCHECK_RET( iface, wxT("no popup interface set for wxComboControl") );
+ HidePopup();
+
+ if ( m_popup )
+ m_popup->RemoveEventHandler(m_popupExtraHandler);
+
+ delete m_popupExtraHandler;
delete m_popupInterface;
- delete m_winPopup;
+
+ if ( m_winPopup )
+ m_winPopup->Destroy();
+
+ m_popupExtraHandler = (wxEvtHandler*) NULL;
+ m_popupInterface = (wxComboPopup*) NULL;
+ m_winPopup = (wxWindow*) NULL;
+ m_popup = (wxWindow*) NULL;
+}
+
+void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
+{
+ wxCHECK_RET( iface, wxT("no popup interface set for wxComboCtrl") );
+
+ DestroyPopup();
iface->InitBase(this);
iface->Init();
m_popupInterface = iface;
- if ( !iface->LazyCreate() || m_winPopup )
+ if ( !iface->LazyCreate() )
{
CreatePopup();
}
}
// Ensures there is atleast the default popup
-void wxComboControlBase::EnsurePopupControl()
+void wxComboCtrlBase::EnsurePopupControl()
{
if ( !m_popupInterface )
SetPopupControl(NULL);
}
-void wxComboControlBase::OnButtonClick()
+void wxComboCtrlBase::OnButtonClick()
{
// Derived classes can override this method for totally custom
// popup action
ShowPopup();
}
-void wxComboControlBase::ShowPopup()
+void wxComboCtrlBase::ShowPopup()
{
EnsurePopupControl();
wxCHECK_RET( !IsPopupShown(), wxT("popup window already shown") );
int popupX;
int popupY = scrPos.y + ctrlSz.y;
+ // Default anchor is wxLEFT
int anchorSide = m_anchorSide;
if ( !anchorSide )
- anchorSide = m_btnSide;
+ anchorSide = wxLEFT;
+
+ int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x;
+ int leftX = scrPos.x - m_extLeft;
+ int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X );
+
+ // If there is not enough horizontal space, anchor on the other side.
+ // If there is no space even then, place the popup at x 0.
+ if ( anchorSide == wxRIGHT )
+ {
+ if ( rightX < 0 )
+ {
+ if ( (leftX+szp.x) < screenWidth )
+ anchorSide = wxLEFT;
+ else
+ anchorSide = 0;
+ }
+ }
+ else
+ {
+ if ( (leftX+szp.x) >= screenWidth )
+ {
+ if ( rightX >= 0 )
+ anchorSide = wxRIGHT;
+ else
+ anchorSide = 0;
+ }
+ }
- // Anchor popup to the side the dropbutton is on
+ // Select x coordinate according to the anchor side
if ( anchorSide == wxRIGHT )
- popupX = scrPos.x + ctrlSz.x + m_extRight- szp.x;
+ popupX = rightX;
+ else if ( anchorSide == wxLEFT )
+ popupX = leftX;
else
- popupX = scrPos.x - m_extLeft;
+ popupX = 0;
if ( spaceBelow < szp.y )
{
}
-void wxComboControlBase::OnPopupDismiss()
+void wxComboCtrlBase::OnPopupDismiss()
{
// Just in case, avoid double dismiss
if ( !m_isPopupShown )
// 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 wxComboControlBase::HidePopup()
+void wxComboCtrlBase::HidePopup()
{
// Should be able to call this without popup interface
//wxCHECK_RET( m_popupInterface, _T("no popup interface") );
// customization methods
// ----------------------------------------------------------------------------
-void wxComboControlBase::SetButtonPosition( int width, int height,
- int side, int spacingX )
+void wxComboCtrlBase::SetButtonPosition( int width, int height,
+ int side, int spacingX )
{
m_btnWid = width;
m_btnHei = height;
RecalcAndRefresh();
}
-void wxComboControlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
+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,
const wxBitmap& bmpHover,
RecalcAndRefresh();
}
-void wxComboControlBase::SetCustomPaintWidth( int width )
+void wxComboCtrlBase::SetCustomPaintWidth( int width )
{
if ( m_text )
{
RecalcAndRefresh();
}
-void wxComboControlBase::SetTextIndent( int indent )
+void wxComboCtrlBase::SetTextIndent( int indent )
{
if ( indent < 0 )
{
RecalcAndRefresh();
}
-wxCoord wxComboControlBase::GetNativeTextIndent() const
+wxCoord wxComboCtrlBase::GetNativeTextIndent() const
{
return DEFAULT_TEXT_INDENT;
}
// methods forwarded to wxTextCtrl
// ----------------------------------------------------------------------------
-wxString wxComboControlBase::GetValue() const
+wxString wxComboCtrlBase::GetValue() const
{
if ( m_text )
return m_text->GetValue();
return m_valueString;
}
-void wxComboControlBase::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 wxComboControlBase::SetText(const wxString& value)
+void wxComboCtrlBase::SetText(const wxString& value)
{
// Unlike in SetValue(), this must be called here or
// the behaviour will no be consistent in readonlys.
m_valueString = value;
+ if ( m_text )
+ {
+ m_ignoreEvtText++;
+ m_text->SetValue( value );
+ }
+
Refresh();
}
-void wxComboControlBase::Copy()
+void wxComboCtrlBase::Copy()
{
if ( m_text )
m_text->Copy();
}
-void wxComboControlBase::Cut()
+void wxComboCtrlBase::Cut()
{
if ( m_text )
m_text->Cut();
}
-void wxComboControlBase::Paste()
+void wxComboCtrlBase::Paste()
{
if ( m_text )
m_text->Paste();
}
-void wxComboControlBase::SetInsertionPoint(long pos)
+void wxComboCtrlBase::SetInsertionPoint(long pos)
{
if ( m_text )
m_text->SetInsertionPoint(pos);
}
-void wxComboControlBase::SetInsertionPointEnd()
+void wxComboCtrlBase::SetInsertionPointEnd()
{
if ( m_text )
m_text->SetInsertionPointEnd();
}
-long wxComboControlBase::GetInsertionPoint() const
+long wxComboCtrlBase::GetInsertionPoint() const
{
if ( m_text )
return m_text->GetInsertionPoint();
return 0;
}
-long wxComboControlBase::GetLastPosition() const
+long wxComboCtrlBase::GetLastPosition() const
{
if ( m_text )
return m_text->GetLastPosition();
return 0;
}
-void wxComboControlBase::Replace(long from, long to, const wxString& value)
+void wxComboCtrlBase::Replace(long from, long to, const wxString& value)
{
if ( m_text )
m_text->Replace(from, to, value);
}
-void wxComboControlBase::Remove(long from, long to)
+void wxComboCtrlBase::Remove(long from, long to)
{
if ( m_text )
m_text->Remove(from, to);
}
-void wxComboControlBase::SetSelection(long from, long to)
+void wxComboCtrlBase::SetSelection(long from, long to)
{
if ( m_text )
m_text->SetSelection(from, to);
}
-void wxComboControlBase::Undo()
+void wxComboCtrlBase::Undo()
{
if ( m_text )
m_text->Undo();
}
-#endif // wxUSE_COMBOCONTROL
+#endif // wxUSE_COMBOCTRL
projects / wxWidgets.git / blobdiff