Commit 2ff53e95 authored by Dick Hollenbeck's avatar Dick Hollenbeck

fix some bugs in FOOTPRINT_VIEWER_FRAME, get rid of statics

parent b22aba20
...@@ -142,6 +142,8 @@ public: ...@@ -142,6 +142,8 @@ public:
PCB_LIB_NICKNAME, PCB_LIB_NICKNAME,
VIEWER_3D_PATH, VIEWER_3D_PATH,
PCB_FOOTPRINT, PCB_FOOTPRINT,
PCB_FOOTPRINT_VIEWER_FPNAME,
PCB_FOOTPRINT_VIEWER_NICKNAME,
RSTRING_COUNT RSTRING_COUNT
}; };
......
...@@ -334,7 +334,6 @@ wxString PCB_BASE_FRAME::SelectFootprint( EDA_DRAW_FRAME* aWindow, ...@@ -334,7 +334,6 @@ wxString PCB_BASE_FRAME::SelectFootprint( EDA_DRAW_FRAME* aWindow,
wxString fpname; wxString fpname;
wxString msg; wxString msg;
wxArrayString libraries; wxArrayString libraries;
FP_LIB_TABLE libTable;
std::vector< wxArrayString > rows; std::vector< wxArrayString > rows;
......
This diff is collapsed.
...@@ -59,15 +59,6 @@ public: ...@@ -59,15 +59,6 @@ public:
*/ */
static const wxChar* GetFootprintViewerFrameName(); static const wxChar* GetFootprintViewerFrameName();
wxString& GetSelectedFootprint( void ) const { return m_selectedFootprintName; }
const wxString GetSelectedLibraryFullName();
/**
* Function GetSelectedLibrary
* @return the selected library name from the #FP_LIB_TABLE.
*/
const wxString& GetSelectedLibrary() { return m_libraryName; }
virtual EDA_COLOR_T GetGridColor() const; virtual EDA_COLOR_T GetGridColor() const;
/** /**
...@@ -86,10 +77,11 @@ private: ...@@ -86,10 +77,11 @@ private:
wxString m_configPath; // subpath for configuration wxString m_configPath; // subpath for configuration
static wxString m_libraryName; // Current selected library const wxString getCurNickname();
static wxString m_footprintName; // Current selected footprint void setCurNickname( const wxString& aNickname );
static wxString m_selectedFootprintName; // When the viewer is used to select a footprint
const wxString getCurFootprintName();
void setCurFootprintName( const wxString& aName );
void OnSize( wxSizeEvent& event ); void OnSize( wxSizeEvent& event );
...@@ -123,8 +115,6 @@ private: ...@@ -123,8 +115,6 @@ private:
void LoadSettings( wxConfigBase* aCfg ); // override virtual void LoadSettings( wxConfigBase* aCfg ); // override virtual
void SaveSettings( wxConfigBase* aCfg ); // override virtual void SaveSettings( wxConfigBase* aCfg ); // override virtual
wxString& GetFootprintName( void ) const { return m_footprintName; }
/** /**
* Function OnActivate * Function OnActivate
* is called when the frame frame is activate to reload the libraries and component lists * is called when the frame frame is activate to reload the libraries and component lists
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment