[GME-commit]
GMESRC/GME/Gme GmePrintDialog.cpp,1.3,1.4 GMEOLEApp.cpp,1.3,1.4
GME.rc,1.114,1.115 GME.dsp,1.83,1.84
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Thu Mar 25 10:45:08 CST 2004
Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv10470
Modified Files:
GmePrintDialog.cpp GMEOLEApp.cpp GME.rc GME.dsp
Log Message:
Panning Window embedded
CVS User: bogyom
Index: GmePrintDialog.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GmePrintDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GmePrintDialog.cpp 3 Mar 2004 18:37:05 -0000 1.3
--- GmePrintDialog.cpp 25 Mar 2004 16:45:06 -0000 1.4
***************
*** 170,175 ****
CGuiAnnotator::GetExtent(m_gmeview->annotators,annext);
extent.UnionRect(&objext, &annext);
! extent.right = (int)(extent.right*1.1); // ??
! extent.bottom = (int)(extent.bottom*1.1); // ??
// papersize
// DEVMODE *lpdevm = GetDevMode();
--- 170,175 ----
CGuiAnnotator::GetExtent(m_gmeview->annotators,annext);
extent.UnionRect(&objext, &annext);
! extent.right = (int)(extent.right*EXTENT_ERROR_CORR); // ??
! extent.bottom = (int)(extent.bottom*EXTENT_ERROR_CORR); // ??
// papersize
// DEVMODE *lpdevm = GetDevMode();
Index: GMEOLEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEApp.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GMEOLEApp.cpp 20 Jan 2004 22:31:33 -0000 1.3
--- GMEOLEApp.cpp 25 Mar 2004 16:45:06 -0000 1.4
***************
*** 531,534 ****
--- 531,540 ----
panel->GetIDispatch(FALSE)->Release(); // We do not hold reference, hopefully the collection will hold one
+ // terge
+ panel = new CGMEOLEPanel();
+ panel->SetParams(&(CMainFrame::theInstance->m_pannWin), _T("Panning Window"));
+ coll->Add(panel->GetIDispatch(FALSE));
+ panel->GetIDispatch(FALSE)->Release(); // We do not hold reference, hopefully the collection will hold one
+
panel = new CGMEOLEPanel();
panel->SetParams(&(CMainFrame::theInstance->m_wndStatusBar), _T("Status Bar"));
Index: GME.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** GME.rc 11 Mar 2004 18:22:49 -0000 1.114
--- GME.rc 25 Mar 2004 16:45:06 -0000 1.115
***************
*** 192,195 ****
--- 192,196 ----
MENUITEM "&Browser", ID_VIEW_BROWSER
MENUITEM "&Attribute Panel", ID_VIEW_ATTRIBUTES
+ MENUITEM "Panning Window", ID_VIEW_PANNWIN
END
POPUP "&Help"
***************
*** 278,281 ****
--- 279,283 ----
MENUITEM "&Browser", ID_VIEW_BROWSER
MENUITEM "&Attribute Panel", ID_VIEW_ATTRIBUTES
+ MENUITEM "Panning Window", ID_VIEW_PANNWIN
END
POPUP "&Window"
***************
*** 539,543 ****
FONT 10, "MS Sans Serif"
BEGIN
! CTEXT GME_VERSION_STR,IDC_STATIC,11,65,152,8,SS_NOPREFIX
CTEXT "Copyright © 2000-2004 Vanderbilt University",IDC_STATIC,
10,75,152,8
--- 541,545 ----
FONT 10, "MS Sans Serif"
BEGIN
! CTEXT "4.3.12",IDC_STATIC,11,65,152,8,SS_NOPREFIX
CTEXT "Copyright © 2000-2004 Vanderbilt University",IDC_STATIC,
10,75,152,8
***************
*** 720,724 ****
WS_CAPTION | WS_SYSMENU
CAPTION "Print"
! FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Printer",1075,8,5,274,63,WS_GROUP
--- 722,726 ----
WS_CAPTION | WS_SYSMENU
CAPTION "Print"
! FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Printer",1075,8,5,274,63,WS_GROUP
***************
*** 738,742 ****
LTEXT "Number of &copies:",1092,298,20,68,8
EDITTEXT 1154,370,18,32,12,ES_NUMBER | WS_GROUP
! ICON "",1086,292,35,76,28,SS_REALSIZEIMAGE | WS_GROUP
CONTROL "C&ollate",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP |
WS_TABSTOP,370,43,36,12
--- 740,744 ----
LTEXT "Number of &copies:",1092,298,20,68,8
EDITTEXT 1154,370,18,32,12,ES_NUMBER | WS_GROUP
! ICON "",1086,292,35,20,20,SS_REALSIZEIMAGE | WS_GROUP
CONTROL "C&ollate",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP |
WS_TABSTOP,370,43,36,12
***************
*** 837,850 ****
END
! IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 158
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
! CAPTION "Dialog"
FONT 8, "MS Sans Serif"
BEGIN
! DEFPUSHBUTTON "OK",IDOK,129,7,50,14
! PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
! COMBOBOX IDC_COMBO1,7,7,112,144,CBS_DROPDOWN | WS_VSCROLL |
! WS_TABSTOP
! EDITTEXT IDC_EDIT1,125,55,54,13,ES_AUTOHSCROLL | ES_NUMBER
END
--- 839,848 ----
END
! IDD_PANNWINDLG DIALOG DISCARDABLE 0, 0, 139, 108
! STYLE DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
! CONTROL "",IDC_PREVIEW,"Button",BS_OWNERDRAW | BS_BITMAP |
! BS_CENTER | BS_VCENTER,4,4,131,100
END
***************
*** 1029,1038 ****
END
! IDD_DIALOG1, DIALOG
BEGIN
LEFTMARGIN, 7
! RIGHTMARGIN, 179
TOPMARGIN, 7
! BOTTOMMARGIN, 151
END
END
--- 1027,1036 ----
END
! IDD_PANNWINDLG, DIALOG
BEGIN
LEFTMARGIN, 7
! RIGHTMARGIN, 136
TOPMARGIN, 7
! BOTTOMMARGIN, 105
END
END
***************
*** 1066,1110 ****
0x0000, 0x0000, 0x0000, 0x0001, 0x25d4, 0x0000, 0x251b, 0x0000, 0x0000,
0x0000,
- 0
- END
-
- IDD_DIALOG1 DLGINIT
- BEGIN
- IDC_COMBO1, 0x403, 3, 0
- 0x3031, "\000"
- IDC_COMBO1, 0x403, 3, 0
- 0x3032, "\000"
- IDC_COMBO1, 0x403, 3, 0
- 0x3033, "\000"
- IDC_COMBO1, 0x403, 3, 0
- 0x3034, "\000"
- IDC_COMBO1, 0x403, 3, 0
- 0x3035, "\000"
- IDC_COMBO1, 0x403, 3, 0
- 0x3036, "\000"
- IDC_COMBO1, 0x403, 3, 0
- 0x3037, "\000"
- IDC_COMBO1, 0x403, 3, 0
- 0x3038, "\000"
- IDC_COMBO1, 0x403, 3, 0
- 0x3039, "\000"
- IDC_COMBO1, 0x403, 4, 0
- 0x3031, 0x0030,
- IDC_COMBO1, 0x403, 4, 0
- 0x3131, 0x0030,
- IDC_COMBO1, 0x403, 4, 0
- 0x3231, 0x0030,
- IDC_COMBO1, 0x403, 4, 0
- 0x3331, 0x0030,
- IDC_COMBO1, 0x403, 4, 0
- 0x3431, 0x0030,
- IDC_COMBO1, 0x403, 4, 0
- 0x3531, 0x0030,
- IDC_COMBO1, 0x403, 4, 0
- 0x3631, 0x0030,
- IDC_COMBO1, 0x403, 5, 0
- 0x616b, 0x616b, "\000"
- IDC_COMBO1, 0x403, 5, 0
- 0x616d, 0x616b, "\000"
0
END
--- 1064,1067 ----
Index: GME.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.dsp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** GME.dsp 25 Feb 2004 21:13:34 -0000 1.83
--- GME.dsp 25 Mar 2004 16:45:06 -0000 1.84
***************
*** 312,315 ****
--- 312,327 ----
# Begin Source File
+ SOURCE=.\PannButton.cpp
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\PanningWindow.cpp
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\PannWinDlg.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\PartBrowser.cpp
# End Source File
***************
*** 529,532 ****
--- 541,556 ----
# Begin Source File
+ SOURCE=.\PannButton.h
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\PanningWindow.h
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\PannWinDlg.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\PartBrowser.h
# End Source File
***************
*** 777,792 ****
# End Target
# End Project
! # Section GME : {E5FE98F1-B7AD-4ABE-89DB-87DDD9DB753E}
! # 2:21:DefaultSinkHeaderFile:search.h
! # 2:16:DefaultSinkClass:CSearch
! # End Section
! # Section GME : {5C402C89-C848-11D3-9A6E-00902721DB65}
! # 2:5:Class:CActiveBrowser
! # 2:10:HeaderFile:activebrowser.h
! # 2:8:ImplFile:activebrowser.cpp
! # End Section
! # Section GME : {B786F53C-297F-4DB8-8060-D45057217AEE}
! # 2:21:DefaultSinkHeaderFile:objectinspector.h
! # 2:16:DefaultSinkClass:CObjectInspector
# End Section
# Section GME : {5C402C8B-C848-11D3-9A6E-00902721DB65}
--- 801,808 ----
# End Target
# End Project
! # Section GME : {B718CCF7-5055-40DD-9CBD-AB17F72AB113}
! # 2:5:Class:CSearch
! # 2:10:HeaderFile:search.h
! # 2:8:ImplFile:search.cpp
# End Section
# Section GME : {5C402C8B-C848-11D3-9A6E-00902721DB65}
***************
*** 799,807 ****
# 2:17:ID_INDICATOR_TIME:ID_INDICATOR_TIME
# End Section
- # Section GME : {B718CCF7-5055-40DD-9CBD-AB17F72AB113}
- # 2:5:Class:CSearch
- # 2:10:HeaderFile:search.h
- # 2:8:ImplFile:search.cpp
- # End Section
# Section GME : {72ADFD78-2C39-11D0-9903-00A0C91BC942}
# 1:10:IDB_SPLASH:112
--- 815,818 ----
***************
*** 812,814 ****
--- 823,838 ----
# 2:10:HeaderFile:objectinspector.h
# 2:8:ImplFile:objectinspector.cpp
+ # End Section
+ # Section GME : {E5FE98F1-B7AD-4ABE-89DB-87DDD9DB753E}
+ # 2:21:DefaultSinkHeaderFile:search.h
+ # 2:16:DefaultSinkClass:CSearch
+ # End Section
+ # Section GME : {5C402C89-C848-11D3-9A6E-00902721DB65}
+ # 2:5:Class:CActiveBrowser
+ # 2:10:HeaderFile:activebrowser.h
+ # 2:8:ImplFile:activebrowser.cpp
+ # End Section
+ # Section GME : {B786F53C-297F-4DB8-8060-D45057217AEE}
+ # 2:21:DefaultSinkHeaderFile:objectinspector.h
+ # 2:16:DefaultSinkClass:CObjectInspector
# End Section
More information about the GME-commit
mailing list