X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e9ec7239f5395666be46b3edd3a6b889fecfe48..062dfc9a96dc9e796c53544f41ff92dc47f26e82:/src/generic/combog.cpp diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp index 0db207c152..be0fa445ca 100644 --- a/src/generic/combog.cpp +++ b/src/generic/combog.cpp @@ -32,6 +32,7 @@ #include "wx/combobox.h" #include "wx/dcclient.h" #include "wx/settings.h" + #include "wx/textctrl.h" #endif #include "wx/dcbuffer.h" @@ -41,35 +42,50 @@ #if defined(__WXUNIVERSAL__) -#define TEXTCTRLXADJUST 0 // position adjustment for wxTextCtrl, with zero indent +// position adjustment for wxTextCtrl, to achieve zero left margin +// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp +#define TEXTCTRLXADJUST 0 + #define TEXTCTRLYADJUST 0 #define TEXTXADJUST 0 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 19 #elif defined(__WXMSW__) -#define TEXTCTRLXADJUST 2 // position adjustment for wxTextCtrl, with zero indent +// position adjustment for wxTextCtrl, to achieve zero left margin +// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp +#define TEXTCTRLXADJUST 2 + #define TEXTCTRLYADJUST 3 #define TEXTXADJUST 0 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 17 #elif defined(__WXGTK__) -#define TEXTCTRLXADJUST -1 // position adjustment for wxTextCtrl, with zero indent +// position adjustment for wxTextCtrl, to achieve zero left margin +// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp +#define TEXTCTRLXADJUST -1 + #define TEXTCTRLYADJUST 0 #define TEXTXADJUST 1 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 23 #elif defined(__WXMAC__) -#define TEXTCTRLXADJUST 0 // position adjustment for wxTextCtrl, with zero indent +// position adjustment for wxTextCtrl, to achieve zero left margin +// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp +#define TEXTCTRLXADJUST 0 + #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 -#define TEXTCTRLXADJUST 0 // position adjustment for wxTextCtrl, with zero indent +// position adjustment for wxTextCtrl, to achieve zero left margin +// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp +#define TEXTCTRLXADJUST 0 + #define TEXTCTRLYADJUST 0 #define TEXTXADJUST 0 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 19 @@ -159,7 +175,8 @@ bool wxGenericComboCtrl::Create(wxWindow *parent, border = wxBORDER_NONE; Customize( wxCC_BUTTON_OUTSIDE_BORDER | - wxCC_NO_TEXT_AUTO_SELECT ); + wxCC_NO_TEXT_AUTO_SELECT | + wxCC_BUTTON_STAYS_DOWN ); #endif @@ -174,21 +191,23 @@ bool wxGenericComboCtrl::Create(wxWindow *parent, pos, size, style | wxFULL_REPAINT_ON_RESIZE, - wxDefaultValidator, + validator, name) ) return false; // Create textctrl, if necessary - CreateTextCtrl( tcBorder, validator ); + CreateTextCtrl( tcBorder ); // Add keyboard input handlers for main control and textctrl InstallInputHandlers(); - // Set background - SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // for double-buffering + // Set background style for double-buffering, when needed + // (cannot use when system draws background automatically) + if ( !HasTransparentBackground() ) + SetBackgroundStyle( wxBG_STYLE_PAINT ); - // SetBestSize should be called last - SetBestSize(size); + // SetInitialSize should be called last + SetInitialSize(size); return true; } @@ -221,11 +240,19 @@ void wxGenericComboCtrl::OnResize() void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) ) { - wxSize sz = GetClientSize(); - wxAutoBufferedPaintDC dc(this); + // Determine wxDC to use based on need to double-buffer or + // use system-generated transparent background portions + wxDC* dcPtr; + if ( HasTransparentBackground() ) + dcPtr = new wxPaintDC(this); + else + dcPtr = new wxAutoBufferedPaintDC(this); + wxDC& dc = *dcPtr; - const wxRect& rectb = m_btnArea; - wxRect rect = m_tcArea; + wxSize sz = GetClientSize(); + const wxRect& butRect = m_btnArea; + wxRect tcRect = m_tcArea; + wxRect fullRect(0, 0, sz.x, sz.y); // artificial simple border if ( m_widthCustomBorder ) @@ -235,14 +262,14 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) ) // Set border colour wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT), customBorder, - wxSOLID ); + wxPENSTYLE_SOLID); dc.SetPen( pen1 ); // area around both controls - wxRect rect2(0,0,sz.x,sz.y); + wxRect rect2(fullRect); if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE ) { - rect2 = m_tcArea; + rect2 = tcRect; if ( customBorder == 1 ) { rect2.Inflate(1); @@ -265,38 +292,49 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) ) dc.DrawRectangle(rect2); } - wxColour winCol = GetBackgroundColour(); - dc.SetBrush(winCol); - dc.SetPen(winCol); - - //wxLogDebug(wxT("hei: %i tcy: %i tchei: %i"),GetClientSize().y,m_tcArea.y,m_tcArea.height); - //wxLogDebug(wxT("btnx: %i tcx: %i tcwid: %i"),m_btnArea.x,m_tcArea.x,m_tcArea.width); + // Clear the main background if the system doesn't do it by itself + if ( !HasTransparentBackground() && + (tcRect.x > 0 || tcRect.y > 0) ) + { + wxColour winCol = GetParent()->GetBackgroundColour(); + dc.SetBrush(winCol); + dc.SetPen(winCol); - // clear main background - dc.DrawRectangle(rect); + dc.DrawRectangle(fullRect); + } if ( !m_btn ) + { // Standard button rendering - DrawButton(dc,rectb,true); + DrawButton(dc, butRect); + } // paint required portion on the control - if ( (!m_text || m_widthCustomPaint) ) + if ( !m_text || m_widthCustomPaint ) { wxASSERT( m_widthCustomPaint >= 0 ); + // Clear the text-control area background + wxColour tcCol = GetBackgroundColour(); + dc.SetBrush(tcCol); + dc.SetPen(tcCol); + dc.DrawRectangle(tcRect); + // this is intentionally here to allow drawed rectangle's // right edge to be hidden if ( m_text ) - rect.width = m_widthCustomPaint; + tcRect.width = m_widthCustomPaint; dc.SetFont( GetFont() ); - dc.SetClippingRegion(rect); + dc.SetClippingRegion(tcRect); if ( m_popupInterface ) - m_popupInterface->PaintComboControl(dc,rect); + m_popupInterface->PaintComboControl(dc, tcRect); else - wxComboPopup::DefaultPaintComboControl(this,dc,rect); + wxComboPopup::DefaultPaintComboControl(this, dc, tcRect); } + + delete dcPtr; } void wxGenericComboCtrl::OnMouseEvent( wxMouseEvent& event ) @@ -385,17 +423,7 @@ void wxGenericComboCtrl::SetCustomPaintWidth( int width ) tc->RemoveEventHandler(m_textEvtHandler); delete m_textEvtHandler; - wxValidator* pValidator = tc->GetValidator(); - if ( pValidator ) - { - pValidator = (wxValidator*) pValidator->Clone(); - CreateTextCtrl( tcCreateStyle, *pValidator ); - delete pValidator; - } - else - { - CreateTextCtrl( tcCreateStyle, wxDefaultValidator ); - } + CreateTextCtrl( tcCreateStyle ); InstallInputHandlers(); } @@ -420,7 +448,8 @@ bool wxGenericComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const } else { - if ( keycode == WXK_DOWN && event.AltDown() ) + if ( (keycode == WXK_DOWN && event.AltDown()) || + (keycode == WXK_F4) ) return true; } @@ -436,7 +465,7 @@ bool wxGenericComboCtrl::PerformAction(const wxControlAction& action, bool processed = false; if ( action == wxACTION_COMBOBOX_POPUP ) { - if ( !m_isPopupShown ) + if ( !IsPopupShown() ) { ShowPopup(); @@ -445,7 +474,7 @@ bool wxGenericComboCtrl::PerformAction(const wxControlAction& action, } else if ( action == wxACTION_COMBOBOX_DISMISS ) { - if ( m_isPopupShown ) + if ( IsPopupShown() ) { HidePopup();