[GME-commit] GMESRC/GME/PartBrowser PartBrowserCtrl.cpp, 1.2, 1.3 PartBrowserDlg.cpp, 1.2, 1.3 PartBrowserPane.cpp, 1.1, 1.2 PartBrowserPaneFrame.cpp, 1.1, 1.2 PartBrowserCtrl.h, 1.2, 1.3 stdafx.h, 1.2, 1.3

Mon Jun 2 12:40:26 CDT 2008

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

Modified Files:
	PartBrowserCtrl.cpp PartBrowserDlg.cpp PartBrowserPane.cpp 
	PartBrowserPaneFrame.cpp PartBrowserCtrl.h stdafx.h 
Log Message:
PanningView ActiveX control

CVS User:  (csaba)

Index: PartBrowserCtrl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/PartBrowser/PartBrowserCtrl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PartBrowserCtrl.cpp	10 Apr 2008 22:32:38 -0000	1.2
--- PartBrowserCtrl.cpp	2 Jun 2008 17:40:24 -0000	1.3
***************
*** 180,184 ****
  	InitializeIIDs(&IID_DPartBrowser, &IID_DPartBrowserEvents);
  	// TODO: Initialize your control's instance data here.
- 	OutputDebugString("CPartBrowserCtrl constructed\n");
  }

--- 180,183 ----
***************
*** 206,215 ****
  	} else {
  		AFX_MANAGE_STATE(AfxGetStaticModuleState());
! 		CBrush brush (RGB(255, 255, 255));
! 		pdc->FillRect (rcBounds, &brush);

  		CRect edge(rcBounds);
  		pdc->DrawEdge(&edge, EDGE_BUMP, BF_RECT);
! 		
  		CString label("PartBrowser OCX");

--- 205,214 ----
  	} else {
  		AFX_MANAGE_STATE(AfxGetStaticModuleState());
! 		CBrush brush(RGB(255, 255, 255));
! 		pdc->FillRect(rcBounds, &brush);

  		CRect edge(rcBounds);
  		pdc->DrawEdge(&edge, EDGE_BUMP, BF_RECT);
! 
  		CString label("PartBrowser OCX");

***************
*** 225,233 ****
  		CDC dcMem;
  		dcMem.CreateCompatibleDC(pdc);
! 		CBitmap *oldbitmap = dcMem.SelectObject(&bitmap);
! 		dcMem.SetMapMode (pdc->GetMapMode());
  		pdc->BitBlt(pos.x, pos.y, size.cx, size.cy, &dcMem, org.x, org.y, SRCCOPY);
  		dcMem.SelectObject(oldbitmap);
! 		
  		pdc->SetTextAlign(TA_CENTER);
  		pdc->TextOut(rcBounds.Width() / 2, rcBounds.Height() / 2, CString("PartBrowser ActiveX Control"));
--- 224,232 ----
  		CDC dcMem;
  		dcMem.CreateCompatibleDC(pdc);
! 		CBitmap* oldbitmap = dcMem.SelectObject(&bitmap);
! 		dcMem.SetMapMode(pdc->GetMapMode());
  		pdc->BitBlt(pos.x, pos.y, size.cx, size.cy, &dcMem, org.x, org.y, SRCCOPY);
  		dcMem.SelectObject(oldbitmap);
! 
  		pdc->SetTextAlign(TA_CENTER);
  		pdc->TextOut(rcBounds.Width() / 2, rcBounds.Height() / 2, CString("PartBrowser ActiveX Control"));
***************
*** 276,280 ****
  		return -1;

! 	m_partBrowserDlg.Create(IDD_PARTBROWSER_DIALOG, this);

  	return 0;
--- 275,280 ----
  		return -1;

! 	if (m_partBrowserDlg.Create(IDD_PARTBROWSER_DIALOG, this) == FALSE)
! 		return -1;

  	return 0;
***************
*** 344,348 ****
  }

! void CPartBrowserCtrl::OnMgaObjectEvent(IMgaObject *obj, unsigned long eventmask)
  {
  	CComPtr<IMgaObject> ccpMgaObject(obj);
--- 344,348 ----
  }

! void CPartBrowserCtrl::OnMgaObjectEvent(IMgaObject* obj, unsigned long eventmask)
  {
  	CComPtr<IMgaObject> ccpMgaObject(obj);

Index: PartBrowserDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/PartBrowser/PartBrowserDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PartBrowserDlg.cpp	10 Apr 2008 22:32:38 -0000	1.2
--- PartBrowserDlg.cpp	2 Jun 2008 17:40:24 -0000	1.3
***************
*** 176,180 ****
  	CDialog::OnSize(nType, cx, cy);

! 	Resize();	
  }

--- 176,180 ----
  	CDialog::OnSize(nType, cx, cy);

! 	Resize();
  }

***************
*** 192,198 ****
  void CPartBrowserDlg::SendAspectChange(long index)
  {
! 	CWnd *wnd = GetParent();
  	if (wnd->IsKindOf(RUNTIME_CLASS(CPartBrowserCtrl))) {
! 		CPartBrowserCtrl *ctrl = STATIC_DOWNCAST(CPartBrowserCtrl, wnd);
  		ctrl->SendAspectChanged(index);
  	}
--- 192,198 ----
  void CPartBrowserDlg::SendAspectChange(long index)
  {
! 	CWnd* wnd = GetParent();
  	if (wnd->IsKindOf(RUNTIME_CLASS(CPartBrowserCtrl))) {
! 		CPartBrowserCtrl* ctrl = STATIC_DOWNCAST(CPartBrowserCtrl, wnd);
  		ctrl->SendAspectChanged(index);
  	}

Index: PartBrowserPaneFrame.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/PartBrowser/PartBrowserPaneFrame.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PartBrowserPaneFrame.cpp	13 Feb 2008 21:23:58 -0000	1.1
--- PartBrowserPaneFrame.cpp	2 Jun 2008 17:40:24 -0000	1.2
***************
*** 125,129 ****
  	RECT r;
  	GetClientRect(&r);
! 	pane.Create(NULL, "PartsPane", WS_CHILD | WS_VISIBLE | WS_BORDER, r, this, IDD_PARTBROWSER_PANE);
  	pane.ModifyStyleEx(0, WS_EX_CLIENTEDGE);

--- 125,129 ----
  	RECT r;
  	GetClientRect(&r);
! 	BOOL success = pane.Create(NULL, "PartsPane", WS_CHILD | WS_VISIBLE | WS_BORDER, r, this, IDD_PARTBROWSER_PANE);
  	pane.ModifyStyleEx(0, WS_EX_CLIENTEDGE);

Index: stdafx.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/PartBrowser/stdafx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** stdafx.h	6 May 2008 01:04:36 -0000	1.2
--- stdafx.h	2 Jun 2008 17:40:24 -0000	1.3
***************
*** 17,33 ****
  // Refer to MSDN for the latest info on corresponding values for different platforms.
  #ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
! #define WINVER 0x0400		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
  #endif

  #ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
! #define _WIN32_WINNT 0x0400	// Change this to the appropriate value to target Windows 2000 or later.
  #endif						

  #ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
! #define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
  #endif

  #ifndef _WIN32_IE			// Allow use of features specific to IE 4.0 or later.
! #define _WIN32_IE 0x0400	// Change this to the appropriate value to target IE 5.0 or later.
  #endif

--- 17,33 ----
  // Refer to MSDN for the latest info on corresponding values for different platforms.
  #ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
! #define WINVER 0x0500		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
  #endif

  #ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
! #define _WIN32_WINNT 0x0500	// Change this to the appropriate value to target Windows 2000 or later.
  #endif						

  #ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
! #define _WIN32_WINDOWS 0x0510 // Change this to the appropriate value to target Windows Me or later.
  #endif

  #ifndef _WIN32_IE			// Allow use of features specific to IE 4.0 or later.
! #define _WIN32_IE 0x0600	// Change this to the appropriate value to target IE 5.0 or later.
  #endif

Index: PartBrowserCtrl.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/PartBrowser/PartBrowserCtrl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PartBrowserCtrl.h	6 May 2008 01:04:36 -0000	1.2
--- PartBrowserCtrl.h	2 Jun 2008 17:40:24 -0000	1.3
***************
*** 65,69 ****
  	afx_msg void AboutBox();

! 	void OnMgaObjectEvent(IMgaObject * obj, unsigned long eventmask);
  	void OnMgaGlobalEvent(globalevent_enum event);

--- 65,69 ----
  	afx_msg void AboutBox();

! 	void OnMgaObjectEvent(IMgaObject* obj, unsigned long eventmask);
  	void OnMgaGlobalEvent(globalevent_enum event);

***************
*** 74,78 ****
  	//}}AFX_EVENT
  	DECLARE_EVENT_MAP()
- // metaPart, &desc, DROPEFFECT_COPY, &rectAwake

  // Native COM interfaces - peter
--- 74,77 ----

Index: PartBrowserPane.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/PartBrowser/PartBrowserPane.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PartBrowserPane.cpp	13 Feb 2008 21:23:58 -0000	1.1
--- PartBrowserPane.cpp	2 Jun 2008 17:40:24 -0000	1.2
***************
*** 28,32 ****

  CPartBrowserPane::CPartBrowserPane():
! 	mgaProject (NULL),
  	mgaMetaModel(NULL),
  	currenAspectIndex(-1),
--- 28,32 ----

  CPartBrowserPane::CPartBrowserPane():
! 	mgaProject(NULL),
  	mgaMetaModel(NULL),
  	currenAspectIndex(-1),
***************
*** 366,370 ****
  	Invalidate();

! 	CFont *oldCFont2 = CFont::FromHandle(oldFont);
  	textMetric.SelectObject(oldCFont2);
  }
--- 366,370 ----
  	Invalidate();

! 	CFont* oldCFont2 = CFont::FromHandle(oldFont);
  	textMetric.SelectObject(oldCFont2);
  }