Fix wxButton::SetBitmapPosition() with GTK+ 3

Make the check for GTK+ >= 2.10 pass for GTK+ 3 too by simply not making
it in this case.

Closes #18004.
This commit is contained in:
Jake Nelson
2017-11-22 23:23:42 +01:00
committed by Vadim Zeitlin
parent 0b8c4d54a8
commit a8671869e5
3 changed files with 4 additions and 1 deletions

2
3rdparty/catch vendored

View File

@@ -173,6 +173,7 @@ wxGTK:
- Make wxBORDER_NONE work for wxTextCtrl with GTK+ 3 (Adrien Tétar).
- Apply wxTextCtrl::SetDefaultStyle() to user-entered text (Andreas Falkenhahn).
- Fix wxTextCtrl::GetStyle() with GTK+ 3.
- Fix wxButton::SetBitmapPosition() with GTK+ 3 (Jake Nelson).
- Support background colour in wxDataViewCtrl attributes.
- Improve wxSpinCtrl best size calculation.
- Implement support for icon locations in wxMimeTypesManager (Hanmac).

View File

@@ -389,7 +389,9 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
void wxAnyButton::DoSetBitmapPosition(wxDirection dir)
{
#ifdef __WXGTK210__
#ifndef __WXGTK3__
if ( !gtk_check_version(2,10,0) )
#endif
{
GtkPositionType gtkpos;
switch ( dir )