/////////////////////////////////////////////////////////////////////////////
-// Name: combocmn.cpp
+// Name: src/common/combocmn.cpp
// Purpose: wxComboCtrlBase
// Author: Jaakko Salli
// Modified by:
#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"
{
int keycode = event.GetKeyCode();
- if ( keycode == WXK_TAB )
+ if ( keycode == WXK_TAB && !m_combo->IsPopupShown() )
{
wxNavigationKeyEvent evt;
evt.SetFlags(wxNavigationKeyEvent::FromTab|
( 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);
+ popupInterface->OnComboKeyEvent(event);
}
else
event.Skip();
m_btnState = 0;
m_btnWidDefault = 0;
m_blankButtonBg = false;
- m_btnWid = m_btnHei = 0;
+ m_btnWid = m_btnHei = -1;
m_btnSide = wxRIGHT;
m_btnSpacingX = 0;
}
bool wxComboCtrlBase::Create(wxWindow *parent,
- wxWindowID id,
- const wxString& value,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxValidator& validator,
- const wxString& name)
+ 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;
}
m_extraEvtHandler = inputHandler;
}
-void wxComboCtrlBase::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);
+ // 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;
+
+ 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_toplevEvtHandler = (wxEvtHandler*) NULL;
#endif
- if ( m_popup )
- m_popup->RemoveEventHandler(m_popupExtraHandler);
-
- delete m_popupExtraHandler;
-
- HidePopup();
-
- delete m_popupInterface;
- delete m_winPopup;
+ DestroyPopup();
RemoveEventHandler(m_extraEvtHandler);
{
wxSize sz = GetClientSize();
int customBorder = m_widthCustomBorder;
- bool buttonOutside;
int btnBorder; // border for button only
// check if button should really be outside the border: we'll do it it if
if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
(m_bmpNormal.Ok() && m_blankButtonBg) ) &&
m_btnSpacingX == 0 &&
- m_btnHei == 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;
}
}
return ret;
}
-void wxComboCtrlBase::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 wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
{
if ( !IsCreated() )
// ----------------------------------------------------------------------------
// draw focus background on area in a way typical on platform
-void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags )
+void wxComboCtrlBase::DrawFocusBackground( 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;
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 wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
{
- // Change event id and relay it forward
+ // 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();
}
popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
}
-void wxComboCtrlBase::SetPopupControl( wxComboPopup* iface )
+// Destroy popup window and the child control
+void wxComboCtrlBase::DestroyPopup()
{
- wxCHECK_RET( iface, wxT("no popup interface set for wxComboCtrl") );
+ if ( m_popup )
+ m_popup->RemoveEventHandler(m_popupExtraHandler);
+
+ delete m_popupExtraHandler;
+
+ HidePopup();
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();
}
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 );
- // Anchor popup to the side the dropbutton is on
+ // 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 )
- popupX = scrPos.x + ctrlSz.x + m_extRight- szp.x;
+ {
+ 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;
+ }
+ }
+
+ // Select x coordinate according to the anchor side
+ if ( anchorSide == wxRIGHT )
+ popupX = rightX;
+ else if ( anchorSide == wxLEFT )
+ popupX = leftX;
else
- popupX = scrPos.x - m_extLeft;
+ popupX = 0;
if ( spaceBelow < szp.y )
{
// ----------------------------------------------------------------------------
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,
projects / wxWidgets.git / blobdiff