[Gtab-cvs] src/factory DefaultDrawerFactory.cpp,1.46,1.47

[m0ta <m0...@us...>]

Update of /cvsroot/gtab/src/factory
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14599/factory

Modified Files:
	DefaultDrawerFactory.cpp 
Log Message:
* changes to reduce warnings

Index: DefaultDrawerFactory.cpp
===================================================================
RCS file: /cvsroot/gtab/src/factory/DefaultDrawerFactory.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** DefaultDrawerFactory.cpp	5 Apr 2006 15:01:18 -0000	1.46
--- DefaultDrawerFactory.cpp	3 Aug 2006 15:34:56 -0000	1.47
***************
*** 64,72 ****
  
  	if (rootXML() == NULL) {
!  		wxMessageBox(wxT("Error loading resource file layout.xml"), 
  						  wxT("ERROR!"), wxOK | wxICON_EXCLAMATION, NULL);
  		exit(1);
  	}
! }    
  
  DefaultDrawerFactory::~DefaultDrawerFactory(void)
--- 64,72 ----
  
  	if (rootXML() == NULL) {
!  		wxMessageBox(wxT("Error loading resource file layout.xml"),
  						  wxT("ERROR!"), wxOK | wxICON_EXCLAMATION, NULL);
  		exit(1);
  	}
! }
  
  DefaultDrawerFactory::~DefaultDrawerFactory(void)
***************
*** 98,107 ****
      TabColumnDrawer* pTabColumnDrawer = new TabColumnDrawer( rootXML() );
      TabFretDrawer* pTabFretDrawer = new TabFretDrawer( rootXML() );
!     
      *pTabColumnDrawer << pTabFretDrawer;
      *pTabMeasureDrawer << pTabColumnDrawer;
  
      *pTabStaffDrawer << pTabMeasureDrawer;
!     
      *pNoteMeasureDrawer << pNoteColumnDrawer;
      *pNoteStaffDrawer << pNoteMeasureDrawer;
--- 98,107 ----
      TabColumnDrawer* pTabColumnDrawer = new TabColumnDrawer( rootXML() );
      TabFretDrawer* pTabFretDrawer = new TabFretDrawer( rootXML() );
! 
      *pTabColumnDrawer << pTabFretDrawer;
      *pTabMeasureDrawer << pTabColumnDrawer;
  
      *pTabStaffDrawer << pTabMeasureDrawer;
! 
      *pNoteMeasureDrawer << pNoteColumnDrawer;
      *pNoteStaffDrawer << pNoteMeasureDrawer;
***************
*** 129,138 ****
  {
      DocumentData* pDocumentData = new DocumentData;
!     PageData* pPageData = new PageData(wxT(""), 6);
      *pDocumentData << pPageData;
      pDocumentData->current();
      SectionData* pSectionData = new SectionData;
      *pPageData << pSectionData;
!     
      StaffData* pStaffData = new StaffData(6);
  
--- 129,138 ----
  {
      DocumentData* pDocumentData = new DocumentData;
!     PageData* pPageData = new PageData(wxT("Default"), 6);
      *pDocumentData << pPageData;
      pDocumentData->current();
      SectionData* pSectionData = new SectionData;
      *pPageData << pSectionData;
! 
      StaffData* pStaffData = new StaffData(6);
  
***************
*** 148,157 ****
  }
  
! PageData* DefaultDrawerFactory::createPage(DocumentData* dd, const wxString& descr, 
      int strings, int key, int clef, TimeSignature ts)
  {
      PageData* pd = new PageData(descr, strings);
      *dd << pd;
!     
      SectionData* sectd = new SectionData;
      *pd << sectd;
--- 148,157 ----
  }
  
! PageData* DefaultDrawerFactory::createPage(DocumentData* dd, const wxString& descr,
      int strings, int key, int clef, TimeSignature ts)
  {
      PageData* pd = new PageData(descr, strings);
      *dd << pd;
! 
      SectionData* sectd = new SectionData;
      *pd << sectd;
***************
*** 163,169 ****
      measd->setKeySignature(key);
      *staffd << measd;
!     
      *measd << new ColumnData(strings, EIGHTH);
!     
      return pd;
  }
--- 163,169 ----
      measd->setKeySignature(key);
      *staffd << measd;
! 
      *measd << new ColumnData(strings, EIGHTH);
! 
      return pd;
  }