Turns out only MSW has odd behavior for bitmap sizing

2 years ago · 4e6092a280
3 changed files with 4 additions and 4 deletions
--- a/common/widgets/bitmap_button.cpp
+++ b/common/widgets/bitmap_button.cpp
@ -95,7 +95,7 @@ void BITMAP_BUTTON::SetPadding( int aPadding )
 void BITMAP_BUTTON::SetBitmap( const wxBitmapBundle& aBmp )
 {
    m_normalBitmap = aBmp;
-#ifdef __WXMAC__
+#ifndef __WXMSW__
    m_unadjustedMinSize = m_normalBitmap.GetDefaultSize();
 #else
    m_unadjustedMinSize = m_normalBitmap.GetPreferredBitmapSizeFor( this );
@ -369,4 +369,4 @@ bool BITMAP_BUTTON::IsChecked() const
    wxASSERT_MSG( hasFlag( wxCONTROL_CHECKABLE ), wxS( "Button is not a checkButton." ) );

    return hasFlag( wxCONTROL_CHECKED );
-}
+}
--- a/common/widgets/split_button.cpp
+++ b/common/widgets/split_button.cpp
@ -97,7 +97,7 @@ void SPLIT_BUTTON::SetBitmap( const wxBitmapBundle& aBmp )
 {
    m_bitmap = aBmp;

-#ifdef __WXMAC__
+#ifndef __WXMSW__
    SetMinSize( m_bitmap.GetDefaultSize() );
 #else
    SetMinSize( m_bitmap.GetPreferredBitmapSizeFor( this ) );
--- a/common/widgets/std_bitmap_button.cpp
+++ b/common/widgets/std_bitmap_button.cpp
@ -77,7 +77,7 @@ void STD_BITMAP_BUTTON::SetBitmap( const wxBitmapBundle& aBmp )
 {
    m_bitmap = aBmp;

-#ifdef __WXMAC__
+#ifndef __WXMSW__
    wxSize size = m_bitmap.GetDefaultSize();
 #else
    wxSize size = m_bitmap.GetPreferredBitmapSizeFor( this );