[GME-commit] GMESRC/GME/Gme GMEDoc.cpp,1.27,1.28

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv1955

Modified Files:
	GMEDoc.cpp 
Log Message:
Correction for the misterious crash upon startup.
Reason: 2 Toolbars created with the same id, although the IDR_MAINFRAME and IDR_TOOLBAR_MODE values are different, 
the ID needs to be provided in the CreateEx methods.



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEDoc.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEDoc.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** GMEDoc.cpp	12 Apr 2005 23:39:25 -0000	1.27
--- GMEDoc.cpp	8 Jul 2005 21:37:54 -0000	1.28
***************
*** 57,61 ****
  	editMode = GME_EDIT_MODE;
  
! 	modeBar.CreateEx(CMainFrame::theInstance,TBSTYLE_TRANSPARENT | TBSTYLE_FLAT);
  	modeBar.LoadToolBar(IDR_TOOLBAR_MODE);
  	modeBar.SetBarStyle(modeBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
--- 57,66 ----
  	editMode = GME_EDIT_MODE;
  
! 	modeBar.CreateEx(CMainFrame::theInstance,
!         TBSTYLE_TRANSPARENT | TBSTYLE_FLAT, 
!         WS_CHILD|WS_VISIBLE|CBRS_ALIGN_LEFT, 
!         CRect(0,0,0,0),
!         IDR_TOOLBAR_MODE); // use a different ID from the default value: AFX_IDW_TOOLBAR (0xe800)
!                            // since that is used by the main toolbar
  	modeBar.LoadToolBar(IDR_TOOLBAR_MODE);
  	modeBar.SetBarStyle(modeBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);