Merge lp:~xzcvczx/kicad/layer_widget_standalone into lp:kicad/product

Proposed by xzcvczx
Status: Merged
Merged at revision: 6378
Proposed branch: lp:~xzcvczx/kicad/layer_widget_standalone
Merge into: lp:kicad/product
Diff against target: 28 lines (+3/-3)
1 file modified
pcbnew/layer_widget.cpp (+3/-3)
To merge this branch: bzr merge lp:~xzcvczx/kicad/layer_widget_standalone
Reviewer Review Type Date Requested Status
Wayne Stambaugh Approve
Review via email: mp+280484@code.launchpad.net

Description of the change

Changed LAYER to LAYER_NUM and -1 to UNSPECIFIED_COLOR inside the

#ifdef STAND_ALONE block as this was apparently updated at some point and not fixed in the STAND_ALONE code

To post a comment you must log in.
Revision history for this message
Wayne Stambaugh (stambaughw) wrote :

I don't see any issues with this patch.

review: Approve
Revision history for this message
Wayne Stambaugh (stambaughw) wrote :

Merge request committed in r6378. Thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pcbnew/layer_widget.cpp'
2--- pcbnew/layer_widget.cpp 2015-09-07 10:52:16 +0000
3+++ pcbnew/layer_widget.cpp 2015-12-14 17:48:18 +0000
4@@ -865,13 +865,13 @@
5 */
6 }
7
8- bool OnLayerSelect( LAYER aLayer )
9+ bool OnLayerSelect( LAYER_NUM aLayer )
10 {
11 printf( "OnLayerSelect( aLayer:%d )\n", aLayer );
12 return true;
13 }
14
15- void OnLayerVisible( LAYER aLayer, bool isVisible, bool isFinal )
16+ void OnLayerVisible( LAYER_NUM aLayer, bool isVisible, bool isFinal )
17 {
18 printf( "OnLayerVisible( aLayer:%d, isVisible:%d isFinal:%d)\n", aLayer, isVisible, isFinal );
19 }
20@@ -910,7 +910,7 @@
21
22 // add some render rows
23 static const LAYER_WIDGET::ROW renderRows[] = {
24- LAYER_WIDGET::ROW( wxT("With Very Large Ears"), 0, -1, wxT("Spock here") ),
25+ LAYER_WIDGET::ROW( wxT("With Very Large Ears"), 0, UNSPECIFIED_COLOR, wxT("Spock here") ),
26 LAYER_WIDGET::ROW( wxT("With Legs"), 1, YELLOW ),
27 LAYER_WIDGET::ROW( wxT("With Oval Eyes"), 1, BROWN, wxT("My eyes are upon you") ),
28 };