Commit 25700d31 authored by Marco Serantoni's avatar Marco Serantoni
Browse files

Fixed kicad.app linking, layer behaviour on OSX and toolbar behaviour

parent 8724386b

common/wineda_toolbar.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 ) )

{

kicad/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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)

pcbnew/layer_widget.cpp

+5 −2
Original line number Diff line number Diff line
@@ -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;