Some wxComboCtrlBase member functions were enclosed within incorrect compatibility condition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -303,7 +303,7 @@ public:
|
|||||||
const wxBitmap& bmpHover = wxNullBitmap,
|
const wxBitmap& bmpHover = wxNullBitmap,
|
||||||
const wxBitmap& bmpDisabled = wxNullBitmap );
|
const wxBitmap& bmpDisabled = wxNullBitmap );
|
||||||
|
|
||||||
#if WXWIN_COMPATIBILITY_2_6
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
//
|
//
|
||||||
// This will set the space in pixels between left edge of the control and the
|
// This will set the space in pixels between left edge of the control and the
|
||||||
// text, regardless whether control is read-only (ie. no wxTextCtrl) or not.
|
// text, regardless whether control is read-only (ie. no wxTextCtrl) or not.
|
||||||
|
@@ -2313,7 +2313,7 @@ wxPoint wxComboCtrlBase::DoGetMargins() const
|
|||||||
return wxPoint(m_marginLeft, -1);
|
return wxPoint(m_marginLeft, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if WXWIN_COMPATIBILITY_2_6
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
void wxComboCtrlBase::SetTextIndent( int indent )
|
void wxComboCtrlBase::SetTextIndent( int indent )
|
||||||
{
|
{
|
||||||
if ( indent < 0 )
|
if ( indent < 0 )
|
||||||
|
Reference in New Issue
Block a user