[GME-commit] GMESRC/GME/Gme StdAfx.h,1.8,1.9 ModelPropertiesDlgBar.h,1.2,1.3 MainFrm.cpp,1.22,1.23 GMEView.h,1.59,1.60 GMEView.cpp,1.147,1.148

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

Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv26341

Modified Files:
	StdAfx.h ModelPropertiesDlgBar.h MainFrm.cpp GMEView.h 
	GMEView.cpp 
Log Message:
Panning window on/off  - refresh corrected

CVS User: bogyom

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/StdAfx.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StdAfx.h	5 May 2004 18:33:58 -0000	1.8
--- StdAfx.h	17 May 2004 17:50:32 -0000	1.9
***************
*** 39,44 ****
  #include "CommonMgaTrukk.h"
  
! #define WM_PANN_SCROLL	(WM_USER+112)
! 
  //{{AFX_INSERT_LOCATION}}
  // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
--- 39,45 ----
  #include "CommonMgaTrukk.h"
  
! #define WM_USER_ZOOM			(WM_USER+111)
! #define WM_PANN_SCROLL			(WM_USER+112)
! #define WM_USER_PANNREFRESH		(WM_USER+113)
  //{{AFX_INSERT_LOCATION}}
  // Microsoft Visual C++ will insert additional declarations immediately before the previous line.

Index: ModelPropertiesDlgBar.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/ModelPropertiesDlgBar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModelPropertiesDlgBar.h	11 Mar 2004 18:05:07 -0000	1.2
--- ModelPropertiesDlgBar.h	17 May 2004 17:50:33 -0000	1.3
***************
*** 13,18 ****
  #define MAX_ZOOM 100
  
- #define WM_USER_ZOOM	(WM_USER+111)
- 
  class CModelPropertiesDlgBar : public CDialogBar
  {
--- 13,16 ----

Index: MainFrm.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/MainFrm.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MainFrm.cpp	11 May 2004 14:22:09 -0000	1.22
--- MainFrm.cpp	17 May 2004 17:50:33 -0000	1.23
***************
*** 409,412 ****
--- 409,419 ----
  {
  	ShowControlBar(&m_pannWin, !m_pannWin.IsVisible(), FALSE);
+ 	CMDIChildWnd* fwin = MDIGetActive(NULL);
+ 	if (!fwin)
+ 		return;
+ 	CView * view = fwin->GetActiveView();
+ 	if (!view)
+ 		return;
+ 	view->PostMessage(WM_USER_PANNREFRESH, (WPARAM)0, (LPARAM)0);
  }
  

Index: GMEView.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** GMEView.h	10 May 2004 20:05:17 -0000	1.59
--- GMEView.h	17 May 2004 17:50:33 -0000	1.60
***************
*** 386,389 ****
--- 386,391 ----
  	afx_msg LRESULT OnZoom(WPARAM wParam, LPARAM lParam);
  	afx_msg LRESULT OnPannScroll(WPARAM wParam, LPARAM lParam);
+ 	afx_msg LRESULT OnPannRefresh(WPARAM wParam, LPARAM lParam);
+ 
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** GMEView.cpp	13 May 2004 16:11:50 -0000	1.147
--- GMEView.cpp	17 May 2004 17:50:33 -0000	1.148
***************
*** 381,384 ****
--- 381,385 ----
  	ON_COMMAND(ID_FILE_PRINT_PREVIEW, CScrollZoomView::OnFilePrintPreview)
  	ON_MESSAGE(WM_USER_ZOOM, OnZoom)
+ 	ON_MESSAGE(WM_USER_PANNREFRESH, OnPannRefresh)
  	ON_MESSAGE(WM_PANN_SCROLL, OnPannScroll)
  
***************
*** 6085,6088 ****
--- 6086,6095 ----
  		Invalidate();
  	}
+ 	return 0;
+ }
+ 
+ LRESULT CGMEView::OnPannRefresh(WPARAM wParam, LPARAM lParam)
+ {
+ 	DoPannWinRefresh();
  	return 0;
  }