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

Remove a #define used in a debug session, and now useless in panel_prev_model.*

This commit is contained in:
jean-pierre charras 2017-02-19 08:30:34 +01:00
parent 2632b1d1a0
commit 1e242f3710
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
View File

@ -41,7 +41,7 @@
#include <class_board.h> #include <class_board.h>
PANEL_PREV_3D_B::PANEL_PREV_3D_B( wxWindow* aParent, S3D_CACHE* aCacheManager, PANEL_PREV_3D::PANEL_PREV_3D( wxWindow* aParent, S3D_CACHE* aCacheManager,
MODULE* aModuleCopy, MODULE* aModuleCopy,
std::vector<S3D_INFO> *aParentInfoList ): std::vector<S3D_INFO> *aParentInfoList ):
PANEL_PREV_3D_BASE( aParent, wxID_ANY ) PANEL_PREV_3D_BASE( aParent, wxID_ANY )
@ -69,14 +69,14 @@ PANEL_PREV_3D_B::PANEL_PREV_3D_B( wxWindow* aParent, S3D_CACHE* aCacheManager,
m_SizerPanelView->Add( m_previewPane, 1, wxEXPAND ); m_SizerPanelView->Add( m_previewPane, 1, wxEXPAND );
m_previewPane->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( m_previewPane->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler(
PANEL_PREV_3D_B::onEnterPreviewCanvas ), NULL, this ); PANEL_PREV_3D::onEnterPreviewCanvas ), NULL, this );
} }
PANEL_PREV_3D_B::~PANEL_PREV_3D_B() PANEL_PREV_3D::~PANEL_PREV_3D()
{ {
m_previewPane->Disconnect( wxEVT_ENTER_WINDOW, m_previewPane->Disconnect( wxEVT_ENTER_WINDOW,
wxMouseEventHandler( PANEL_PREV_3D_B::onEnterPreviewCanvas ), NULL, this ); wxMouseEventHandler( PANEL_PREV_3D::onEnterPreviewCanvas ), NULL, this );
delete m_settings3Dviewer; delete m_settings3Dviewer;
delete m_dummyBoard; delete m_dummyBoard;
@ -84,7 +84,7 @@ PANEL_PREV_3D_B::~PANEL_PREV_3D_B()
} }
void PANEL_PREV_3D_B::initPanel() void PANEL_PREV_3D::initPanel()
{ {
m_resolver = NULL; m_resolver = NULL;
currentModelFile.clear(); currentModelFile.clear();

8
3d-viewer/3d_cache/dialogs/panel_prev_model.h
View File

@ -62,16 +62,14 @@ class BOARD;
class CINFO3D_VISU; class CINFO3D_VISU;
class MODULE; class MODULE;
#define PANEL_PREV_3D_B PANEL_PREV_3D class PANEL_PREV_3D: public PANEL_PREV_3D_BASE
class PANEL_PREV_3D_B: public PANEL_PREV_3D_BASE
{ {
public: public:
PANEL_PREV_3D_B( wxWindow* aParent, S3D_CACHE* aCacheManager, PANEL_PREV_3D( wxWindow* aParent, S3D_CACHE* aCacheManager,
MODULE* aModuleCopy, MODULE* aModuleCopy,
std::vector<S3D_INFO> *aParentInfoList = NULL ); std::vector<S3D_INFO> *aParentInfoList = NULL );
~PANEL_PREV_3D_B(); ~PANEL_PREV_3D();
private: private:
wxString currentModelFile; ///< Used to check if the model file was changed wxString currentModelFile; ///< Used to check if the model file was changed