2008-Feb-12 UPDATE Tim Hanson [email protected]

================================================================================
+eeschema
        * commiting my changes to allow multiple instances of a given schematic file within 
a hierarchy:
        ** internally, m_currentScreen has been replaced with m_currentSheet,
                which is a list or 'path' of screens.  The path of screens is used to 
generate
                a series of timestamps, which is converted to flat component reference via 
a look-up
                table in the schematic files.
        ** this means that m_currentScreen is no longer used -- use GetScreen().
        ** GetScreen is virtual, as some of the dialogs keep around a WinEDA_BaseScreen 
pointer.
        ** all sub-sheets in a given schematic must have different names to generate a 
meaningful netlist.

common/common_plot_functions.cpp

@@ -80,7 +80,7 @@ void PlotWorkSheet(int format_plot, BASE_SCREEN * screen)
 */
 {
 #define WSTEXTSIZE 50	// Text size in mils
-Ki_PageDescr * Sheet = screen->m_CurrentSheet;
+Ki_PageDescr * Sheet = screen->m_CurrentSheetDesc;
 int ii, jj, xg , yg, ipas, gxpas, gypas;
 wxSize PageSize;
 wxPoint pos, ref;
@@ -234,11 +234,11 @@ int UpperLimit = VARIABLE_BLOCK_START_POSITION;
 				break;
 
 			case WS_SIZESHEET:
-				msg += screen->m_CurrentSheet->m_Name;
+				msg += screen->m_CurrentSheetDesc->m_Name;
 				break;
 
 			case WS_IDENTSHEET:
-				msg << screen->m_SheetNumber << wxT("/") << screen->m_NumberOfSheet;
+				msg << screen->m_ScreenNumber << wxT("/") << screen->m_NumberOfScreen;
 				break;
 
 			case WS_COMPANY_NAME: