cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxButton::SetBitmapPosition() with GTK+ 3

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/catch vendored

@ -1 +1 @@
Subproject commit 2d91035404884089d1faf038300e437963e0c2a4 Subproject commit 011f6e6458d888246f94643e293f002073cff489

1
docs/changes.txt
View File

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

2
src/gtk/anybutton.cpp
View File

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