Require wxWidgets 3.2
Removes old defines and work arounds for earlier wx versions and adds a CMake requirement to use at least 3.2 (or the minimum matching wxPython version)
This commit is contained in:
@@ -40,12 +40,7 @@ SPLIT_BUTTON::SPLIT_BUTTON( wxWindow* aParent, wxWindowID aId, const wxString& a
|
||||
{
|
||||
if( aSize == wxDefaultSize )
|
||||
{
|
||||
#if wxCHECK_VERSION( 3, 1, 3 )
|
||||
wxSize defaultSize = wxButton::GetDefaultSize( aParent );
|
||||
#else
|
||||
wxSize defaultSize = wxButton::GetDefaultSize();
|
||||
#endif
|
||||
|
||||
wxSize defaultSize = wxButton::GetDefaultSize( aParent );
|
||||
wxSize textSize = GetTextExtent( m_label );
|
||||
SetMinSize( wxSize( std::max( textSize.GetWidth(), defaultSize.GetWidth() + 1 ),
|
||||
defaultSize.GetHeight() + 1 ) );
|
||||
|
||||
Reference in New Issue
Block a user