[GME-commit] GMESRC/GME/Gme GME.rc, 1.158, 1.159 GMEDoc.cpp, 1.37, 1.38 GMEDoc.h, 1.17, 1.18 GMEView.cpp, 1.193, 1.194

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

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

Modified Files:
	GME.rc GMEDoc.cpp GMEDoc.h GMEView.cpp 
Log Message:
Temp checkin.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEView.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** GMEView.cpp	3 May 2007 18:30:34 -0000	1.193
--- GMEView.cpp	20 Jun 2007 17:16:00 -0000	1.194
***************
*** 1304,1308 ****
  		while (!pendingRequests.IsEmpty()) {
  			CPendingRequest* req = pendingRequests.RemoveHead();
! 			req->Execute(this);
  			delete req;
  		}
--- 1304,1309 ----
  		while (!pendingRequests.IsEmpty()) {
  			CPendingRequest* req = pendingRequests.RemoveHead();
! 			if( CGMEDoc::theInstance && !CGMEDoc::theInstance->m_isClosing)
! 				req->Execute(this);
  			delete req;
  		}

Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** GME.rc	2 Jun 2007 15:28:58 -0000	1.158
--- GME.rc	20 Jun 2007 17:16:00 -0000	1.159
***************
*** 150,154 ****
      BUTTON      ID_WINDOW_TILE_VERT
      SEPARATOR
!     BUTTON      ID_APP_ABOUT
  END
  
--- 150,154 ----
      BUTTON      ID_WINDOW_TILE_VERT
      SEPARATOR
!     BUTTON      ID_VIEW_REFRESH_SOURCECONTROL
  END
  

Index: GMEDoc.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEDoc.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** GMEDoc.cpp	13 Mar 2007 14:55:05 -0000	1.37
--- GMEDoc.cpp	20 Jun 2007 17:16:00 -0000	1.38
***************
*** 73,76 ****
--- 73,78 ----
  	theInstance = this;
  
+ 	m_isClosing = false;
+ 
  	editMode = GME_EDIT_MODE;
  
***************
*** 799,802 ****
--- 801,806 ----
  		break;
  	}
+ 
+ 	m_isClosing = false; // in case was turned true
  }
  
***************
*** 914,917 ****
--- 918,922 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEDoc::OnCloseDocument\r\n");
+ 	m_isClosing = true;
  	POSITION pos = GetFirstViewPosition();
  	while (pos) {
***************
*** 950,953 ****
--- 955,959 ----
  	
  	// TODO: Add your specialized creation code here
+ 	m_isClosing = false;
  	
  	return TRUE;

Index: GMEDoc.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEDoc.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GMEDoc.h	13 Mar 2007 14:55:05 -0000	1.17
--- GMEDoc.h	20 Jun 2007 17:16:00 -0000	1.18
***************
*** 26,29 ****
--- 26,30 ----
  public:
  	static CGMEDoc *theInstance;
+ 	bool     m_isClosing;
  	CToolBar modeBar;
  	CToolBar naviBar;