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

Fix for gtk1.x

Browse Source
This commit is contained in:
Jouk
2020-04-21 08:40:45 +02:00
parent 4d3190c9f7
commit 9426490333
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/propgrid/editors.cpp
View File

@@ -2136,7 +2136,11 @@ int wxPGMultiButton::GenId( int itemid ) const
#if defined(__WXGTK__) #if defined(__WXGTK__)
// Dedicated wxBitmapButton with reduced internal borders // Dedicated wxBitmapButton with reduced internal borders
#if defined( __WXGTK127__ )
#include "wx/gtk1/private.h"
#else
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#endif
class wxPGEditorBitmapButton : public wxBitmapButton class wxPGEditorBitmapButton : public wxBitmapButton
{ {
@@ -2149,7 +2153,9 @@ public:
#if defined(__WXGTK3__) #if defined(__WXGTK3__)
GTKApplyCssStyle("*{ padding:0 }"); GTKApplyCssStyle("*{ padding:0 }");
#else #else
#if !defined( __WXGTK127__ )
GTKApplyWidgetStyle(true); // To enforce call to DoApplyWidgetStyle() GTKApplyWidgetStyle(true); // To enforce call to DoApplyWidgetStyle()
#endif
#endif #endif
} }
@@ -2160,8 +2166,10 @@ protected:
{ {
if ( style ) if ( style )
{ {
#if !defined( __WXGTK127__ )
style->xthickness = 0; style->xthickness = 0;
style->ythickness = 0; style->ythickness = 0;
#endif
} }
wxBitmapButton::DoApplyWidgetStyle(style); wxBitmapButton::DoApplyWidgetStyle(style);
} }