cleanup - reformat; added (disabled) support for secondary highlight color

[wxWidgets.git] / src / mac / carbon / icon.cpp

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 4ec8afe3775d8feeba2ab528c9713cdae9e247fe..8423ef62248393d5edd6834844b08518f36aa38a 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -9,17 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "icon.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/icon.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
 
 #include "wx/image.h"
 #include "wx/mac/private.h"
@@ -184,8 +178,6 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
                 CopyFromBitmap( bmp ) ;
                 return true;
             }
-#else
-            return false;
 #endif
         }
     }