From 25700d31d19ec305fb505e3698355f3575608120 Mon Sep 17 00:00:00 2001
From: Marco Serantoni <marco.serantoni@gmail.com>
Date: Mon, 1 Nov 2010 20:03:08 +0100
Subject: [PATCH] Fixed kicad.app linking, layer behaviour on OSX and toolbar
 behaviour

---
 common/wineda_toolbar.cpp | 2 +-
 kicad/CMakeLists.txt      | 2 +-
 pcbnew/layer_widget.cpp   | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/wineda_toolbar.cpp b/common/wineda_toolbar.cpp
index a4a6845677..d4e1f258d1 100644
--- a/common/wineda_toolbar.cpp
+++ b/common/wineda_toolbar.cpp
@@ -13,7 +13,7 @@
 WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,
                                 wxWindowID id, bool horizontal ):
     wxAuiToolBar( parent, id, wxDefaultPosition, wxDefaultSize,
-                  wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | ( ( horizontal ) ?
+                  wxAUI_TB_DEFAULT_STYLE | ( ( horizontal ) ?
                                              wxAUI_TB_HORZ_LAYOUT :
                                              wxAUI_TB_VERTICAL ) )
 {
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 7a9f237190..42fdf5c745 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -44,7 +44,7 @@ add_executable(kicad WIN32 MACOSX_BUNDLE
 
 if(APPLE)
     set_target_properties(kicad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
-	target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES})
+	target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES})
 else(APPLE)
 	target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES})
 endif(APPLE)
diff --git a/pcbnew/layer_widget.cpp b/pcbnew/layer_widget.cpp
index 27706c59ad..2ec96cc348 100644
--- a/pcbnew/layer_widget.cpp
+++ b/pcbnew/layer_widget.cpp
@@ -44,7 +44,6 @@
 #define BUTT_SIZE_Y             18
 #define BUTT_VOID               4
 
-
 /* XPM */
 static const char * clear_xpm[] = {
 "10 14 1 1",
@@ -152,9 +151,13 @@ wxBitmapButton* LAYER_WIDGET::makeColorButton( wxWindow* aParent, int aColor, in
     // then create a wxBitmapButton from it.
     wxBitmap bitmap = makeBitmap( aColor );
 
+#ifndef __WXMAC__
     wxBitmapButton* ret = new wxBitmapButton( aParent, aID, bitmap,
         wxDefaultPosition, wxSize(BUTT_SIZE_X, BUTT_SIZE_Y), wxBORDER_RAISED );
-
+#else
+    wxBitmapButton* ret = new wxBitmapButton( aParent, aID, bitmap,
+        wxDefaultPosition, wxSize(BUTT_SIZE_X, BUTT_SIZE_Y));
+#endif
     // save the color value in the name, no where else to put it.
     ret->SetName( makeColorTxt( aColor ) );
     return ret;