This patch fixes the Win32 build, which was broken after the last
batch of changes to the GR_Graphics stuff.
As I've learned lately, I'm not the only person who builds on Win32,
but apparently I am the one who complains the loudest. ;poke Aaron :)
-Tom
Index: src/wp/ap/win/ap_Win32TopRuler.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32TopRuler.cpp,v
retrieving revision 1.15
diff -u -r1.15 ap_Win32TopRuler.cpp
--- src/wp/ap/win/ap_Win32TopRuler.cpp 2000/07/07 23:46:56 1.15
+++ src/wp/ap/win/ap_Win32TopRuler.cpp 2000/07/09 04:40:06
@@ -56,7 +56,7 @@
AP_TopRuler::setView(pView);
DELETEP(m_pG);
- GR_Win32Graphics * pG = new GR_Win32Graphics(GetDC(m_hwndTopRuler),
m_hwndTopRuler, pView->getApp());
+ GR_Win32Graphics * pG = new GR_Win32Graphics(GetDC(m_hwndTopRuler),
+m_hwndTopRuler, m_pFrame->getApp());
m_pG = pG;
UT_ASSERT(m_pG);
Index: src/wp/ap/win/ap_Win32StatusBar.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32StatusBar.cpp,v
retrieving revision 1.12
diff -u -r1.12 ap_Win32StatusBar.cpp
--- src/wp/ap/win/ap_Win32StatusBar.cpp 2000/07/07 23:46:56 1.12
+++ src/wp/ap/win/ap_Win32StatusBar.cpp 2000/07/09 04:40:06
@@ -53,7 +53,7 @@
void AP_Win32StatusBar::setView(AV_View * pView)
{
DELETEP(m_pG);
- GR_Win32Graphics * pG = new GR_Win32Graphics(GetDC(m_hwndStatusBar),
m_hwndStatusBar, pView->getApp());
+ GR_Win32Graphics * pG = new GR_Win32Graphics(GetDC(m_hwndStatusBar),
+m_hwndStatusBar, m_pFrame->getApp());
m_pG = pG;
UT_ASSERT(m_pG);
Index: src/wp/ap/win/ap_Win32LeftRuler.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32LeftRuler.cpp,v
retrieving revision 1.9
diff -u -r1.9 ap_Win32LeftRuler.cpp
--- src/wp/ap/win/ap_Win32LeftRuler.cpp 2000/07/07 23:46:56 1.9
+++ src/wp/ap/win/ap_Win32LeftRuler.cpp 2000/07/09 04:40:06
@@ -55,7 +55,7 @@
AP_LeftRuler::setView(pView);
DELETEP(m_pG);
- GR_Win32Graphics * pG = new GR_Win32Graphics(GetDC(m_hwndLeftRuler),
m_hwndLeftRuler, pView->getApp());
+ GR_Win32Graphics * pG = new GR_Win32Graphics(GetDC(m_hwndLeftRuler),
+m_hwndLeftRuler, m_pFrame->getApp());
m_pG = pG;
UT_ASSERT(m_pG);
Index: src/af/xap/win/xap_Win32Dlg_About.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32Dlg_About.cpp,v
retrieving revision 1.17
diff -u -r1.17 xap_Win32Dlg_About.cpp
--- src/af/xap/win/xap_Win32Dlg_About.cpp 2000/06/19 14:59:04 1.17
+++ src/af/xap/win/xap_Win32Dlg_About.cpp 2000/07/09 04:40:06
@@ -320,7 +323,7 @@
r.right = pThis->m_pGrImageSidebar->getDisplayWidth();
FillRect(hdc, &r, GetSysColorBrush(COLOR_BTNFACE));
- GR_Win32Graphics gr(hdc,hWnd);
+ GR_Win32Graphics gr(hdc,hWnd,pThis->m_pFrame->getApp());
gr.drawImage(pThis->m_pGrImageSidebar,
0,
(r.bottom -
pThis->m_pGrImageSidebar->getDisplayHeight())/2);
Index: src/af/gr/win/gr_Win32Graphics.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/gr/win/gr_Win32Graphics.cpp,v
retrieving revision 1.45
diff -u -r1.45 gr_Win32Graphics.cpp
--- src/af/gr/win/gr_Win32Graphics.cpp 2000/07/07 23:46:45 1.45
+++ src/af/gr/win/gr_Win32Graphics.cpp 2000/07/09 04:40:06
@@ -51,14 +51,14 @@
GR_Win32Graphics::GR_Win32Graphics(HDC hdc, HWND hwnd, XAP_App * app)
{
_constructorCommonCode(hdc);
- m_App = app;
+ m_pApp = app;
m_hwnd = hwnd;
}
GR_Win32Graphics::GR_Win32Graphics(HDC hdc, const DOCINFO * pDocInfo, XAP_App * app)
{
_constructorCommonCode(hdc);
- m_App = app;
+ m_pApp = app;
m_bPrint = UT_TRUE;
m_pDocInfo = pDocInfo;
}
