From ddadf560da7ec1d7477a40ed5b9277b6468dc5e7 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Mon, 2 Nov 2009 14:57:35 +0000 Subject: [PATCH 1/1] 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 --- include/wx/combo.h | 2 +- src/common/combocmn.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/combo.h b/include/wx/combo.h index c3699fae7c..797658c901 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -303,7 +303,7 @@ public: const wxBitmap& bmpHover = 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 // text, regardless whether control is read-only (ie. no wxTextCtrl) or not. diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index e2ca80fdee..fafd36425e 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -2313,7 +2313,7 @@ wxPoint wxComboCtrlBase::DoGetMargins() const return wxPoint(m_marginLeft, -1); } -#if WXWIN_COMPATIBILITY_2_6 +#if WXWIN_COMPATIBILITY_2_8 void wxComboCtrlBase::SetTextIndent( int indent ) { if ( indent < 0 ) -- 2.47.2