haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix order of cvpcb link libraries, make some PAGE_INFO functions inline

This commit is contained in:
Dick Hollenbeck 2012-01-15 23:38:11 -06:00
parent b76d05f591
commit 286c62d898
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/class_page_info.cpp
View File

@ -197,26 +197,8 @@ void PAGE_INFO::SetWidthMils( int aWidthInMils )
}
int PAGE_INFO::GetWidthMils() const
{
return m_size.x;
}
void PAGE_INFO::SetHeightMils( int aHeightInMils )
{
m_size.y = clampHeight( aHeightInMils );
}
int PAGE_INFO::GetHeightMils() const
{
return m_size.y;
}
const wxSize& PAGE_INFO::GetSizeMils() const
{
return m_size;
}

2
cvpcb/CMakeLists.txt
View File

@ -85,7 +85,7 @@ endif(APPLE)
###
# Link executable target cvpcb with correct libraries
###
target_link_libraries(cvpcb 3d-viewer common pcbcommon polygon bitmaps kbool
target_link_libraries(cvpcb 3d-viewer pcbcommon common polygon bitmaps kbool
${OPENGL_LIBRARIES}
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}

6
include/common.h
View File

@ -177,12 +177,12 @@ public:
bool IsPortrait() const { return m_portrait; }
void SetWidthMils( int aWidthInMils );
int GetWidthMils() const;
int GetWidthMils() const { return m_size.x; }
void SetHeightMils( int aHeightInMils );
int GetHeightMils() const;
int GetHeightMils() const { return m_size.y; }
const wxSize& GetSizeMils() const;
const wxSize& GetSizeMils() const { return m_size; }
// Accessors returning "Internal Units (IU)". IUs are mils in EESCHEMA,
// and either deci-mils or nanometers in PCBNew.