[GME-commit] GMESRC/GME/Gme PanningWindowWrapper.cpp, NONE, 1.1 GMEPanningWindow.h, NONE, 1.1 PanningWindowWrapper.h, NONE, 1.1 PartBrowserWrapper.cpp, 1.1, 1.2 ScrollZoomView.cpp, 1.17, 1.18 ChildFrm.h, 1.4, 1.5 GMEPartBrowser.h, 1.2, 1.3 MainFrm.h, 1.34, 1.35 PartBrowserWrapper.h, 1.1, 1.2 resource.h, 1.80, 1.81 GME.rc, 1.174, 1.175 GME.vcproj, 1.11, 1.12 PannWinDlg.cpp, 1.5, NONE PannButton.h, 1.4, NONE PanningWindow.h, 1.5, NONE PannWinDlg.h, 1.4, NONE

Log messages of CVS commits gme-commit at list.isis.vanderbilt.edu
Mon Jun 2 12:40:26 CDT 2008


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

Modified Files:
	PartBrowserWrapper.cpp ScrollZoomView.cpp ChildFrm.h 
	GMEPartBrowser.h MainFrm.h PartBrowserWrapper.h resource.h 
	GME.rc GME.vcproj 
Added Files:
	PanningWindowWrapper.cpp GMEPanningWindow.h 
	PanningWindowWrapper.h 
Removed Files:
	PannWinDlg.cpp PannButton.h PanningWindow.h PannWinDlg.h 
Log Message:
PanningView ActiveX control

CVS User:  (csaba)

--- PannWinDlg.h DELETED ---

--- PannButton.h DELETED ---

--- PanningWindow.h DELETED ---

Index: MainFrm.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/MainFrm.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** MainFrm.h	1 May 2008 16:26:45 -0000	1.34
--- MainFrm.h	2 Jun 2008 17:40:24 -0000	1.35
***************
*** 15,19 ****
  #include "GMEConsole.h"
  #include "GMESearch.h"
! #include "PanningWindow.h"
  #include "GMEOLEApp.h"
  // #include "..\include\stl\string"
--- 15,19 ----
  #include "GMEConsole.h"
  #include "GMESearch.h"
! #include "GMEPanningWindow.h"
  #include "GMEOLEApp.h"
  // #include "..\include\stl\string"
***************
*** 59,65 ****
  	void ResetPartBrowser()							{ m_partBrowser.RePaint(); }
  	void ChangePartBrowserAspect(int ind)			{ m_partBrowser.ChangeAspect(ind); }
! 	void CyclePartBrowserAspect()                   { m_partBrowser.CycleAspect(); }
  	BOOL CMainFrame::VerifyBarState(LPCTSTR lpszProfileName);
!     void ShowObjectInspector();
  	void ShowFindDlg();
  	void HideFindDlg();
--- 59,66 ----
  	void ResetPartBrowser()							{ m_partBrowser.RePaint(); }
  	void ChangePartBrowserAspect(int ind)			{ m_partBrowser.ChangeAspect(ind); }
! 	void CyclePartBrowserAspect()					{ m_partBrowser.CycleAspect(); }
  	BOOL CMainFrame::VerifyBarState(LPCTSTR lpszProfileName);
! 	void OnDeleteDCForPanningVindowCtrl(CDC* bCDC);
! 	void ShowObjectInspector();
  	void ShowFindDlg();
  	void HideFindDlg();
***************
*** 91,110 ****
  	virtual void Dump(CDumpContext& dc) const;
  #endif
! 	CPanningWindow	m_pannWin;
! 	CGMEConsole	m_console;
  
  
  protected:  // control bar embedded members
! 	CStatusBar		m_wndStatusBar;
! 	CToolBar		m_wndToolBarMain;
! 	CToolBar		m_wndToolBarWins;
! 	CComponentBar	m_wndComponentBar;
! 	CDialogBar		m_wndDlgBar;
! 	CGMEPartBrowser	m_partBrowser;
! 	CGMEBrowser	    m_browser;
  	CGMEObjectInspector	m_objectInspector;
! 	CGMESearch		m_search;
  
! 	UINT			m_autosaveTimerID;
  
  // Generated message map functions
--- 92,111 ----
  	virtual void Dump(CDumpContext& dc) const;
  #endif
! 	CGMEPanningWindow	m_panningWindow;
! 	CGMEConsole			m_console;
  
  
  protected:  // control bar embedded members
! 	CStatusBar			m_wndStatusBar;
! 	CToolBar			m_wndToolBarMain;
! 	CToolBar			m_wndToolBarWins;
! 	CComponentBar		m_wndComponentBar;
! 	CDialogBar			m_wndDlgBar;
! 	CGMEPartBrowser		m_partBrowser;
! 	CGMEBrowser			m_browser;
  	CGMEObjectInspector	m_objectInspector;
! 	CGMESearch			m_search;
  
! 	UINT				m_autosaveTimerID;
  
  // Generated message map functions

Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** resource.h	10 Apr 2008 23:02:08 -0000	1.80
--- resource.h	2 Jun 2008 17:40:24 -0000	1.81
***************
*** 68,72 ****
  #define IDD_DIALOG1                     205
  #define ID_PANNWIN                      206
- #define IDD_PANNWINDLG                  207
  #define IDD_NEW_MULTIUSER_PROJ_DLG      208
  #define IDD_CONSOLE_DIALOG              209
--- 68,71 ----
***************
*** 80,83 ****
--- 79,83 ----
  #define IDR_CRASH_TEST_MENU             218
  #define IDD_EMERGENCY_DIALOG            219
+ #define IDD_PANNING_WINDOW_DIALOG       220
  #define IDC_NAME                        1000
  #define IDC_TYPENAME                    1001
***************
*** 88,92 ****
  #define IDC_BASETYPE_LABEL              1006
  #define IDC_ASPECT_TAB                  1007
- #define IDD_PARTBROWSER_PANE            1008
  #define IDC_ZOOMS                       1008
  #define IDC_MODELNAME                   1009
--- 88,91 ----
***************
*** 190,193 ****
--- 189,193 ----
  #define IDC_STATIC_SVN_SECTION1         1115
  #define IDC_PARTBROWSERCTRL1            1116
+ #define IDC_PANNINGWINDOWCTRL1          1117
  #define IDC_LIST1                       1124
  #define IDC_EMERGENCY_INFO_STATIC       1125
***************
*** 450,456 ****
  #ifndef APSTUDIO_READONLY_SYMBOLS
  #define _APS_3D_CONTROLS                     1
! #define _APS_NEXT_RESOURCE_VALUE        220
  #define _APS_NEXT_COMMAND_VALUE         33086
! #define _APS_NEXT_CONTROL_VALUE         1127
  #define _APS_NEXT_SYMED_VALUE           115
  #endif
--- 450,456 ----
  #ifndef APSTUDIO_READONLY_SYMBOLS
  #define _APS_3D_CONTROLS                     1
! #define _APS_NEXT_RESOURCE_VALUE        221
  #define _APS_NEXT_COMMAND_VALUE         33086
! #define _APS_NEXT_CONTROL_VALUE         1128
  #define _APS_NEXT_SYMED_VALUE           115
  #endif

--- NEW FILE: PanningWindowWrapper.cpp ---
// Machine generated IDispatch wrapper class(es) created by Microsoft Visual C++

// NOTE: Do not modify the contents of this file.  If this class is regenerated by
//  Microsoft Visual C++, your modifications will be overwritten.


#include "stdafx.h"
#include "panningwindowwrapper.h"

/////////////////////////////////////////////////////////////////////////////
// CPartBrowser

IMPLEMENT_DYNCREATE(CPanningWindowWrapper, CWnd)

/////////////////////////////////////////////////////////////////////////////
// CPanningWindowWrapper operations

void CPanningWindowWrapper::SetBitmapDC(ULONGLONG ownerCWnd, ULONGLONG bCDC,
										LONG orix, LONG oriy, LONG oriw, LONG orih,
										LONG rx, LONG ry, LONG rw, LONG rh,
										OLE_COLOR bkgrnd)
{
	static BYTE parms[] =
		VTS_UI8 VTS_UI8 VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_COLOR;
	InvokeHelper(0x1, DISPATCH_METHOD, VT_EMPTY, NULL, parms,
		ownerCWnd, bCDC, orix, oriy, oriw, orih, rx, ry, rw, rh, bkgrnd);
}

void CPanningWindowWrapper::SetViewRect(LONG vrx, LONG vry, LONG vrw, LONG vrh)
{
	static BYTE parms[] =
		VTS_I4 VTS_I4 VTS_I4 VTS_I4;
	InvokeHelper(0x2, DISPATCH_METHOD, VT_EMPTY, NULL, parms,
		vrx, vry, vrw, vrh);
}

void CPanningWindowWrapper::AboutBox()
{
	InvokeHelper(0xfffffdd8, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
}

Index: ChildFrm.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/ChildFrm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChildFrm.h	3 May 2006 16:50:26 -0000	1.4
--- ChildFrm.h	2 Jun 2008 17:40:24 -0000	1.5
***************
*** 54,59 ****
  // Generated message map functions
  protected:
- 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
  	//{{AFX_MSG(CChildFrame)
  	afx_msg void OnClose();
  	//}}AFX_MSG
--- 54,59 ----
  // Generated message map functions
  protected:
  	//{{AFX_MSG(CChildFrame)
+ 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
  	afx_msg void OnClose();
  	//}}AFX_MSG

--- NEW FILE: PanningWindowWrapper.h ---
#if !defined(AFX_PANNINGWINDOWWRAPPER_H__803661F9_1F2F_4592_99AD_85CD4504E4F4__INCLUDED_)
#define AFX_PANNINGWINDOWWRAPPER_H__803661F9_1F2F_4592_99AD_85CD4504E4F4__INCLUDED_

#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// Machine generated IDispatch wrapper class(es) created by Microsoft Visual C++

// NOTE: Do not modify the contents of this file.  If this class is regenerated by
//  Microsoft Visual C++, your modifications will be overwritten.

/////////////////////////////////////////////////////////////////////////////
// CPanningWindowWrapper wrapper class

#pragma warning(disable: 4100) // unreferenced formal parameter warning

class CPanningWindowWrapper : public CWnd
{
protected:
	DECLARE_DYNCREATE(CPanningWindowWrapper)
public:
	CLSID const& GetClsid()
	{
		static CLSID const clsid
			= { 0xB0C28BAA, 0x7E44, 0x404C, { 0xBE, 0xAD, 0x83, 0x73, 0x53, 0x56, 0xF1, 0xD2 } };
		return clsid;
	}
	virtual BOOL Create(LPCTSTR lpszClassName,
		LPCTSTR lpszWindowName, DWORD dwStyle,
		const RECT& rect,
		CWnd* pParentWnd, UINT nID,
		CCreateContext* pContext = NULL)
	{ return CreateControl(GetClsid(), lpszWindowName, dwStyle, rect, pParentWnd, nID); }

	BOOL Create(LPCTSTR lpszWindowName, DWORD dwStyle,
		const RECT& rect, CWnd* pParentWnd, UINT nID,
		CFile* pPersist = NULL, BOOL bStorage = FALSE,
		BSTR bstrLicKey = NULL)
	{ return CreateControl(GetClsid(), lpszWindowName, dwStyle, rect, pParentWnd, nID,
		pPersist, bStorage, bstrLicKey); }

// Attributes
public:

// Operations
public:
	void SetBitmapDC(ULONGLONG ownerCWnd, ULONGLONG bCDC,
					 LONG orix, LONG oriy, LONG oriw, LONG orih,
					 LONG rx, LONG ry, LONG rw, LONG rh,
					 OLE_COLOR bkgrnd);
	void SetViewRect(LONG vrx, LONG vry, LONG vrw, LONG vrh);
	void AboutBox();
};

#pragma warning(default: 4100) // unreferenced formal parameter warning

//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

#endif // !defined(AFX_PANNINGWINDOWWRAPPER_H__803661F9_1F2F_4592_99AD_85CD4504E4F4__INCLUDED_)

--- PannWinDlg.cpp DELETED ---

Index: PartBrowserWrapper.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/PartBrowserWrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PartBrowserWrapper.h	13 Feb 2008 21:23:58 -0000	1.1
--- PartBrowserWrapper.h	2 Jun 2008 17:40:24 -0000	1.2
***************
*** 11,22 ****
  
  /////////////////////////////////////////////////////////////////////////////
! // CPartBrowser wrapper class
  
  #pragma warning(disable: 4100) // unreferenced formal parameter warning
  
! class CPartBrowser : public CWnd
  {
  protected:
! 	DECLARE_DYNCREATE(CPartBrowser)
  public:
  	CLSID const& GetClsid()
--- 11,22 ----
  
  /////////////////////////////////////////////////////////////////////////////
! // CPartBrowserWrapper class
  
  #pragma warning(disable: 4100) // unreferenced formal parameter warning
  
! class CPartBrowserWrapper : public CWnd
  {
  protected:
! 	DECLARE_DYNCREATE(CPartBrowserWrapper)
  public:
  	CLSID const& GetClsid()

Index: PartBrowserWrapper.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/PartBrowserWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PartBrowserWrapper.cpp	13 Feb 2008 21:23:58 -0000	1.1
--- PartBrowserWrapper.cpp	2 Jun 2008 17:40:24 -0000	1.2
***************
*** 9,20 ****
  
  /////////////////////////////////////////////////////////////////////////////
! // CPartBrowser
  
! IMPLEMENT_DYNCREATE(CPartBrowser, CWnd)
  
  /////////////////////////////////////////////////////////////////////////////
! // CPartBrowser operations
  
! void CPartBrowser::SetCurrentProject(LPUNKNOWN pMgaProject)
  {
  	static BYTE parms[] =
--- 9,20 ----
  
  /////////////////////////////////////////////////////////////////////////////
! // CPartBrowserWrapper
  
! IMPLEMENT_DYNCREATE(CPartBrowserWrapper, CWnd)
  
  /////////////////////////////////////////////////////////////////////////////
! // CPartBrowserWrapper operations
  
! void CPartBrowserWrapper::SetCurrentProject(LPUNKNOWN pMgaProject)
  {
  	static BYTE parms[] =
***************
*** 24,28 ****
  }
  
! void CPartBrowser::SetMetaModel(LPUNKNOWN meta)
  {
  	static BYTE parms[] =
--- 24,28 ----
  }
  
! void CPartBrowserWrapper::SetMetaModel(LPUNKNOWN meta)
  {
  	static BYTE parms[] =
***************
*** 32,36 ****
  }
  
! void CPartBrowser::SetBgColor(OLE_COLOR oleBgColor)
  {
  	static BYTE parms[] =
--- 32,36 ----
  }
  
! void CPartBrowserWrapper::SetBgColor(OLE_COLOR oleBgColor)
  {
  	static BYTE parms[] =
***************
*** 40,44 ****
  }
  
! void CPartBrowser::ChangeAspect(LONG index)
  {
  	static BYTE parms[] =
--- 40,44 ----
  }
  
! void CPartBrowserWrapper::ChangeAspect(LONG index)
  {
  	static BYTE parms[] =
***************
*** 48,62 ****
  }
  
! void CPartBrowser::CycleAspect(void)
  {
  	InvokeHelper(0x5, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
  }
  
! void CPartBrowser::RePaint(void)
  {
  	InvokeHelper(0x6, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
  }
  
! void CPartBrowser::AboutBox()
  {
  	InvokeHelper(0xfffffdd8, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
--- 48,62 ----
  }
  
! void CPartBrowserWrapper::CycleAspect(void)
  {
  	InvokeHelper(0x5, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
  }
  
! void CPartBrowserWrapper::RePaint(void)
  {
  	InvokeHelper(0x6, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
  }
  
! void CPartBrowserWrapper::AboutBox()
  {
  	InvokeHelper(0xfffffdd8, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);

Index: GME.vcproj
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.vcproj,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GME.vcproj	1 May 2008 16:41:09 -0000	1.11
--- GME.vcproj	2 Jun 2008 17:40:24 -0000	1.12
***************
*** 797,800 ****
--- 797,803 ----
  			</File>
  			<File
+ 				RelativePath=".\GMEPanningWindow.cpp">
+ 			</File>
+ 			<File
  				RelativePath=".\GMEPartBrowser.cpp">
  			</File>
***************
*** 1067,1134 ****
  			</File>
  			<File
! 				RelativePath="PannButton.cpp">
! 				<FileConfiguration
! 					Name="Release|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="1"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BrowseInformation="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Debug|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="0"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"/>
! 				</FileConfiguration>
! 			</File>
! 			<File
! 				RelativePath="PanningWindow.cpp">
! 				<FileConfiguration
! 					Name="Release|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="1"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BrowseInformation="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Debug|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="0"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"/>
! 				</FileConfiguration>
! 			</File>
! 			<File
! 				RelativePath="PannWinDlg.cpp">
! 				<FileConfiguration
! 					Name="Release|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="1"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BrowseInformation="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Debug|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="0"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"/>
! 				</FileConfiguration>
  			</File>
  			<File
--- 1070,1074 ----
  			</File>
  			<File
! 				RelativePath=".\PanningWindowWrapper.cpp">
  			</File>
  			<File
***************
*** 1544,1547 ****
--- 1484,1490 ----
  			</File>
  			<File
+ 				RelativePath=".\GMEPanningWindow.h">
+ 			</File>
+ 			<File
  				RelativePath=".\GMEPartBrowser.h">
  			</File>
***************
*** 1595,1605 ****
  			</File>
  			<File
! 				RelativePath="PannButton.h">
! 			</File>
! 			<File
! 				RelativePath="PanningWindow.h">
! 			</File>
! 			<File
! 				RelativePath="PannWinDlg.h">
  			</File>
  			<File
--- 1538,1542 ----
  			</File>
  			<File
! 				RelativePath=".\PanningWindowWrapper.h">
  			</File>
  			<File

Index: GMEPartBrowser.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEPartBrowser.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GMEPartBrowser.h	30 Apr 2008 16:01:24 -0000	1.2
--- GMEPartBrowser.h	2 Jun 2008 17:40:24 -0000	1.3
***************
*** 18,22 ****
  
  /////////////////////////////////////////////////////////////////////////////
! // CPartBrowser window
  
  class CGMEPartBrowser : public CSizingControlBar
--- 18,22 ----
  
  /////////////////////////////////////////////////////////////////////////////
! // CGMEPartBrowser window
  
  class CGMEPartBrowser : public CSizingControlBar
***************
*** 28,32 ****
  
  	IDispatch * GetInterface() {
! 		LPUNKNOWN pUnk = m_PartBrowser.GetControlUnknown();
  
  		// From there get the IDispatch interface of control.
--- 28,32 ----
  
  	IDispatch * GetInterface() {
! 		LPUNKNOWN pUnk = m_PartBrowserWrapper.GetControlUnknown();
  
  		// From there get the IDispatch interface of control.
***************
*** 39,43 ****
  	//{{AFX_DATA(CGMEPartBrowser)
  	enum { IDD = IDD_PART_BROWSER_DIALOG };
! 	CPartBrowser	m_PartBrowser;
  	//}}AFX_DATA
  
--- 39,43 ----
  	//{{AFX_DATA(CGMEPartBrowser)
  	enum { IDD = IDD_PART_BROWSER_DIALOG };
! 	CPartBrowserWrapper	m_PartBrowserWrapper;
  	//}}AFX_DATA
  

Index: ScrollZoomView.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/ScrollZoomView.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ScrollZoomView.cpp	12 Jan 2005 17:53:16 -0000	1.17
--- ScrollZoomView.cpp	2 Jun 2008 17:40:24 -0000	1.18
***************
*** 401,405 ****
  	CMainFrame* main = (CMainFrame*)theApp.m_pMainWnd;
  
! 	if (!main  ||  !main->m_pannWin.IsVisible())
  		return;
  	CRect client;
--- 401,405 ----
  	CMainFrame* main = (CMainFrame*)theApp.m_pMainWnd;
  
! 	if (!main || !main->m_panningWindow.IsVisible())
  		return;
  	CRect client;
***************
*** 414,418 ****
  	pannw.NormalizeRect();
  
! 	main->m_pannWin.SetViewRect(pannw);
  }
  
--- 414,418 ----
  	pannw.NormalizeRect();
  
! 	main->m_panningWindow.SetViewRect(pannw);
  }
  

--- NEW FILE: GMEPanningWindow.h ---
// GMEPanningWindow.h: interface for the CGMEPanningWindow class.
//
//////////////////////////////////////////////////////////////////////
//{{AFX_INCLUDES()
#include "PanningWindowWrapper.h"
//}}AFX_INCLUDES

#if !defined(AFX_GMEPANNINGWINDOW_H__EA4F9478_F8EB_4494_8D36_E31CF129200C__INCLUDED_)
#define AFX_GMEPANNINGWINDOW_H__EA4F9478_F8EB_4494_8D36_E31CF129200C__INCLUDED_

#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000

#include "sizecbar.h"
#include "resource.h"

/////////////////////////////////////////////////////////////////////////////
// CGMEPanningWindow window

class CGMEPanningWindow : public CSizingControlBar
{
// Construction
public:
	CGMEPanningWindow();
	virtual ~CGMEPanningWindow() { theInstance = 0; };

	IDispatch * GetInterface() {
		LPUNKNOWN pUnk = m_PanningWindowWrapper.GetControlUnknown();

		// From there get the IDispatch interface of control.
		LPDISPATCH pDisp = NULL;
		pUnk->QueryInterface(IID_IDispatch, (LPVOID*)&pDisp);
		return pDisp;
	}

	// Dialog Data
	//{{AFX_DATA(CGMEPanningWindow)
	enum { IDD = IDD_PANNING_WINDOW_DIALOG };
	CPanningWindowWrapper	m_PanningWindowWrapper;
	//}}AFX_DATA

	static CGMEPanningWindow *theInstance;

// Overrides
	// ClassWizard generated virtual function overrides
	//{{AFX_VIRTUAL(CGMEPanningWindow)
	public:
	virtual BOOL PreTranslateMessage(MSG* pMsg);
	protected:
	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
	//}}AFX_VIRTUAL

	virtual void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler);

	// Generated message map functions
	//{{AFX_MSG(CGMEPanningWindow)
	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
	afx_msg void OnSize(UINT nType, int cx, int cy);
	afx_msg void OnDeleteDeviceContextGmePanningVindowCtrl(ULONGLONG bCDC);
	DECLARE_EVENTSINK_MAP()
	//}}AFX_MSG
	DECLARE_MESSAGE_MAP()

// Implementation
public:
	void SetBitmapDC(CWnd* owner, CDC* bdc, CRect& ori, CRect& rect, COLORREF& bkgrnd);
	void SetViewRect(CRect vrect);
};

//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.

#endif // !defined(AFX_GMEPANNINGWINDOW_H__EA4F9478_F8EB_4494_8D36_E31CF129200C__INCLUDED_)

Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** GME.rc	1 May 2008 17:43:05 -0000	1.174
--- GME.rc	2 Jun 2008 17:40:24 -0000	1.175
***************
*** 1022,1033 ****
  END
  
- IDD_PANNWINDLG DIALOGEX 0, 0, 139, 108
- STYLE DS_SETFONT | DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
- FONT 8, "MS Sans Serif", 0, 0, 0x1
- BEGIN
-     CONTROL         "",IDC_PREVIEW,"Button",BS_OWNERDRAW | BS_BITMAP | 
-                     BS_CENTER | BS_VCENTER,4,4,131,100,WS_EX_CLIENTEDGE
- END
- 
  IDD_NEW_MULTIUSER_PROJ_DLG DIALOGEX 0, 0, 374, 230
  STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
--- 1022,1025 ----
***************
*** 1156,1159 ****
--- 1148,1162 ----
  END
  
+ IDD_PANNING_WINDOW_DIALOG DIALOGEX 0, 0, 186, 90
+ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
+     WS_SYSMENU
+ CAPTION "Dialog"
+ FONT 8, "MS Shell Dlg", 400, 0, 0x1
+ BEGIN
+     CONTROL         "",IDC_PANNINGWINDOWCTRL1,
+                     "{B0C28BAA-7E44-404C-BEAD-83735356F1D2}",WS_TABSTOP,7,7,
+                     172,76
+ END
+ 
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 1311,1322 ****
      BEGIN
          TOPMARGIN, 4
-     END
- 
-     IDD_PANNWINDLG, DIALOG
-     BEGIN
-         LEFTMARGIN, 7
-         RIGHTMARGIN, 136
-         TOPMARGIN, 7
-         BOTTOMMARGIN, 105
      END
  
--- 1314,1317 ----



More information about the GME-commit mailing list