Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/combo.h b/include/wx/combo.h
index c3699fae7c1bad0157f4e1fcf40d9e29481f961f..797658c901a568b83695c87afebfb032c88be185 100644 (file)
--- 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 e2ca80fdeee5e30b529747b8c52a2c0a05712478..fafd36425e7815fe16df95b901f1e4d8be1c4d29 100644 (file)
--- 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 )