diff --git a/common/widgets/bitmap_button.cpp b/common/widgets/bitmap_button.cpp
index 46263b603d..f535094346 100644
--- 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 );
-}
\ No newline at end of file
+}
diff --git a/common/widgets/split_button.cpp b/common/widgets/split_button.cpp
index 3d8315453f..f8f375101c 100644
--- 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 ) );
diff --git a/common/widgets/std_bitmap_button.cpp b/common/widgets/std_bitmap_button.cpp
index 0251439593..2006358562 100644
--- 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 );