#include "wx/combobox.h"
#include "wx/dcclient.h"
#include "wx/settings.h"
+ #include "wx/textctrl.h"
#endif
#include "wx/dcbuffer.h"
#define TEXTCTRLXADJUST 0 // position adjustment for wxTextCtrl, with zero indent
#define TEXTCTRLYADJUST 0
#define TEXTXADJUST 0 // how much is read-only text's x adjusted
-#define DEFAULT_DROPBUTTON_WIDTH 19
+#define DEFAULT_DROPBUTTON_WIDTH 22
#else
// ----------------------------------------------------------------------------
-// wxGenericComboControl
+// wxGenericComboCtrl
// ----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(wxGenericComboControl, wxComboCtrlBase)
- EVT_PAINT(wxGenericComboControl::OnPaintEvent)
- EVT_MOUSE_EVENTS(wxGenericComboControl::OnMouseEvent)
+BEGIN_EVENT_TABLE(wxGenericComboCtrl, wxComboCtrlBase)
+ EVT_PAINT(wxGenericComboCtrl::OnPaintEvent)
+ EVT_MOUSE_EVENTS(wxGenericComboCtrl::OnMouseEvent)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxGenericComboControl, wxComboCtrlBase)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericComboCtrl, wxComboCtrlBase)
-void wxGenericComboControl::Init()
+void wxGenericComboCtrl::Init()
{
}
-bool wxGenericComboControl::Create(wxWindow *parent,
- wxWindowID id,
- const wxString& value,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxValidator& validator,
- const wxString& name)
+bool wxGenericComboCtrl::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& value,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
{
-
- // Set border
+ //
+ // Note that technically we only support 'default' border and wxNO_BORDER.
long border = style & wxBORDER_MASK;
+ int tcBorder = wxNO_BORDER;
- if ( !border )
- {
#if defined(__WXUNIVERSAL__)
+ if ( !border )
border = wxBORDER_SIMPLE;
#elif defined(__WXMSW__)
+ if ( !border )
// For XP, have 1-width custom border, for older version use sunken
- if ( wxUxThemeEngine::GetIfActive() )
+ /*if ( wxUxThemeEngine::GetIfActive() )
{
border = wxBORDER_NONE;
m_widthCustomBorder = 1;
}
- else
+ else*/
border = wxBORDER_SUNKEN;
-#elif defined(__WXGTK__)
- border = wxBORDER_NONE;
- //m_widthCustomBorder = 2;
- m_widthCustomBorder = 1;
#else
- border = wxBORDER_SIMPLE;
-#endif
- style = (style & ~(wxBORDER_MASK)) | border;
+ //
+ // Generic version is optimized for wxGTK
+ //
+
+ #define UNRELIABLE_TEXTCTRL_BORDER
+
+ if ( !border )
+ {
+ if ( style & wxCB_READONLY )
+ {
+ m_widthCustomBorder = 1;
+ }
+ else
+ {
+ m_widthCustomBorder = 0;
+ tcBorder = 0;
+ }
+ }
+ else
+ {
+ // Have textctrl instead use the border given.
+ tcBorder = border;
}
-#if defined(__WXGTK__)
+ // Because we are going to have button outside the border,
+ // let's use wxBORDER_NONE for the whole control.
+ border = wxBORDER_NONE;
+
Customize( wxCC_BUTTON_OUTSIDE_BORDER |
- wxCC_NO_TEXT_AUTO_SELECT );
+ wxCC_NO_TEXT_AUTO_SELECT |
+ wxCC_BUTTON_STAYS_DOWN );
+
#endif
+ style = (style & ~(wxBORDER_MASK)) | border;
if ( style & wxCC_STD_BUTTON )
m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
return false;
// Create textctrl, if necessary
- CreateTextCtrl( wxNO_BORDER, validator );
+ CreateTextCtrl( tcBorder, validator );
// Add keyboard input handlers for main control and textctrl
InstallInputHandlers();
// Set background
SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // for double-buffering
- // SetBestSize should be called last
- SetBestSize(size);
+ // SetInitialSize should be called last
+ SetInitialSize(size);
return true;
}
-wxGenericComboControl::~wxGenericComboControl()
+wxGenericComboCtrl::~wxGenericComboCtrl()
{
}
-void wxGenericComboControl::OnResize()
+void wxGenericComboCtrl::OnResize()
{
// Recalculates button and textctrl areas
PositionTextCtrl( TEXTCTRLXADJUST, TEXTCTRLYADJUST );
}
-void wxGenericComboControl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
+void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
{
wxSize sz = GetClientSize();
- wxBufferedPaintDC dc(this,GetBufferBitmap(sz));
+ wxAutoBufferedPaintDC dc(this);
const wxRect& rectb = m_btnArea;
wxRect rect = m_tcArea;
// Set border colour
wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT),
customBorder,
- wxSOLID );
+ wxPENSTYLE_SOLID);
dc.SetPen( pen1 );
// area around both controls
dc.DrawRectangle(rect2);
}
+#ifndef __WXMAC__ // see note in OnThemeChange
wxColour winCol = GetBackgroundColour();
+#else
+ wxColour winCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
dc.SetBrush(winCol);
dc.SetPen(winCol);
// clear main background
dc.DrawRectangle(rect);
-
+
if ( !m_btn )
+ {
// Standard button rendering
- DrawButton(dc,rectb,true);
+ DrawButton(dc,rectb);
+ }
// paint required portion on the control
if ( (!m_text || m_widthCustomPaint) )
}
}
-void wxGenericComboControl::OnMouseEvent( wxMouseEvent& event )
+void wxGenericComboCtrl::OnMouseEvent( wxMouseEvent& event )
{
- bool isOnButtonArea = m_btnArea.Inside(event.m_x,event.m_y);
+ int mx = event.m_x;
+ bool isOnButtonArea = m_btnArea.Contains(mx,event.m_y);
int handlerFlags = isOnButtonArea ? wxCC_MF_ON_BUTTON : 0;
- // Preprocessing fabricates double-clicks and prevents
- // (it may also do other common things in future)
if ( PreprocessMouseEvent(event,handlerFlags) )
return;
}
else
{
- if ( isOnButtonArea || HasCapture() )
+ if ( isOnButtonArea || HasCapture() ||
+ (m_widthCustomPaint && mx < (m_tcArea.x+m_widthCustomPaint)) )
{
+ handlerFlags |= wxCC_MF_ON_CLICK_AREA;
+
if ( HandleButtonMouseEvent(event,handlerFlags) )
return;
}
}
-bool wxGenericComboControl::IsKeyPopupToggle(const wxKeyEvent& event) const
+void wxGenericComboCtrl::SetCustomPaintWidth( int width )
+{
+#ifdef UNRELIABLE_TEXTCTRL_BORDER
+ //
+ // If starting/stopping to show an image in front
+ // of a writable text-field, then re-create textctrl
+ // with different kind of border (because we can't
+ // assume that textctrl fully supports wxNO_BORDER).
+ //
+ wxTextCtrl* tc = GetTextCtrl();
+
+ if ( tc && (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) )
+ {
+ int borderType = tc->GetWindowStyle() & wxBORDER_MASK;
+ int tcCreateStyle = -1;
+
+ if ( width > 0 )
+ {
+ // Re-create textctrl with no border
+ if ( borderType != wxNO_BORDER )
+ {
+ m_widthCustomBorder = 1;
+ tcCreateStyle = wxNO_BORDER;
+ }
+ }
+ else if ( width == 0 )
+ {
+ // Re-create textctrl with normal border
+ if ( borderType == wxNO_BORDER )
+ {
+ m_widthCustomBorder = 0;
+ tcCreateStyle = 0;
+ }
+ }
+
+ // Common textctrl re-creation code
+ if ( tcCreateStyle != -1 )
+ {
+ tc->RemoveEventHandler(m_textEvtHandler);
+ delete m_textEvtHandler;
+
+#if wxUSE_VALIDATORS
+ wxValidator* pValidator = tc->GetValidator();
+ if ( pValidator )
+ {
+ pValidator = (wxValidator*) pValidator->Clone();
+ CreateTextCtrl( tcCreateStyle, *pValidator );
+ delete pValidator;
+ }
+ else
+#endif
+ {
+ CreateTextCtrl( tcCreateStyle, wxDefaultValidator );
+ }
+
+ InstallInputHandlers();
+ }
+ }
+#endif // UNRELIABLE_TEXTCTRL_BORDER
+
+ wxComboCtrlBase::SetCustomPaintWidth( width );
+}
+
+bool wxGenericComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
{
int keycode = event.GetKeyCode();
bool isPopupShown = IsPopupShown();
}
else
{
- if ( keycode == WXK_DOWN && event.AltDown() )
+ if ( (keycode == WXK_DOWN && event.AltDown()) ||
+ (keycode == WXK_F4) )
return true;
}
#ifdef __WXUNIVERSAL__
-bool wxGenericComboControl::PerformAction(const wxControlAction& action,
- long numArg,
- const wxString& strArg)
+bool wxGenericComboCtrl::PerformAction(const wxControlAction& action,
+ long numArg,
+ const wxString& strArg)
{
bool processed = false;
if ( action == wxACTION_COMBOBOX_POPUP )
{
- if ( !m_isPopupShown )
+ if ( !IsPopupShown() )
{
ShowPopup();
}
else if ( action == wxACTION_COMBOBOX_DISMISS )
{
- if ( m_isPopupShown )
+ if ( IsPopupShown() )
{
HidePopup();
// If native wxComboCtrl was not defined, then prepare a simple
// front-end so that wxRTTI works as expected.
#ifndef _WX_COMBOCONTROL_H_
-IMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxGenericComboControl)
+IMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxGenericComboCtrl)
#endif
#endif // !wxCOMBOCONTROL_FULLY_FEATURED
projects / wxWidgets.git / blobdiff