From 63d606d58ff78b0c6671de71efd1c44c99012ad4 Mon Sep 17 00:00:00 2001 From: "selmer%netscape.com" Date: Tue, 12 Oct 1999 00:56:51 +0000 Subject: [PATCH] Fix up inclusions of headers git-svn-id: svn://10.0.0.236/trunk@50401 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cck/driver/ProgDlgThread.cpp | 1 + mozilla/cck/driver/ProgressDialog.cpp | 2 +- mozilla/cck/driver/PropSheet.cpp | 1 + mozilla/cck/driver/PropSheet.h | 2 +- mozilla/cck/driver/WizardMachine.aps | Bin 43080 -> 27932 bytes mozilla/cck/driver/WizardMachine.cpp | 1 + mozilla/cck/driver/WizardMachine.h | 2 +- mozilla/cck/driver/WizardMachine.mak | 2 +- mozilla/cck/driver/WizardMachine.ncb | Bin 41984 -> 41984 bytes mozilla/cck/driver/WizardMachineDlg.cpp | 1 + mozilla/cck/driver/WizardUI.cpp | 8 +++++--- mozilla/cck/driver/makefile.win | 2 ++ 12 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mozilla/cck/driver/ProgDlgThread.cpp b/mozilla/cck/driver/ProgDlgThread.cpp index 3fa08e903cb..e900e81d8a4 100644 --- a/mozilla/cck/driver/ProgDlgThread.cpp +++ b/mozilla/cck/driver/ProgDlgThread.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "WizardMachine.h" +#include "WizardMachineDlg.h" #include "ProgDlgThread.h" #ifdef _DEBUG diff --git a/mozilla/cck/driver/ProgressDialog.cpp b/mozilla/cck/driver/ProgressDialog.cpp index 082b34b6e81..77837be7bf0 100644 --- a/mozilla/cck/driver/ProgressDialog.cpp +++ b/mozilla/cck/driver/ProgressDialog.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "WizardMachine.h" -//#include "ProgressDialog.h" +#include "ProgressDialog.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/mozilla/cck/driver/PropSheet.cpp b/mozilla/cck/driver/PropSheet.cpp index 91ca7607f22..8a48edeb35d 100644 --- a/mozilla/cck/driver/PropSheet.cpp +++ b/mozilla/cck/driver/PropSheet.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "WizardMachine.h" +#include "PropSheet.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/mozilla/cck/driver/PropSheet.h b/mozilla/cck/driver/PropSheet.h index 9a5ee324978..d8011f23676 100644 --- a/mozilla/cck/driver/PropSheet.h +++ b/mozilla/cck/driver/PropSheet.h @@ -21,7 +21,7 @@ ///////////////////////////////////////////////////////////////////////////// // CPropSheet -#include "WizardUI.h" +//#include "WizardUI.h" class CPropSheet : public CPropertySheet { diff --git a/mozilla/cck/driver/WizardMachine.aps b/mozilla/cck/driver/WizardMachine.aps index 7bbcc0f9dd3df23ccf75604112c0544225cd4190..e57861dbaaabaa581c4dbf6234a045a480f2e2ae 100644 GIT binary patch delta 1682 zcmcgsTTB#Z6h1Sv%)+X%mCNGpvJ9~xnu?2pBE$l_v)lySLa`;;auq5q3%K00FT_UD zhDO8g*;o`~B_bNynl$vmq_K%lttL&{rcd;elJvnCFEwczA6mEHKRdLfHGS+%_CMc$ z{&UWMF5k`25H6m#&8QP+MSl~Ry=cn=tIkOrui`sg(prUKIFW#ADyf^`79V&7Te0rQ-!%~CAF<6FR z-w!Nq_^;eWO{0h|ZVizaxDS4Z$wP${?0U-e1&KCdm5okX$xn~zS&HL%i&_z86jyd5 z1?lq}v#yCXD zVj#3s#+O~93 z`Mzudon4TKo`bAG|Gkj$_${o2p`=)30|{N?NwMe#HH$&Z5W4rKF+kC;AiCKN>I5;) zFtnnpVeAA2hmARfao&S&9YM_1coQj>1YZI$90b3^2o=H*s*J$GHAoG>-Nv~H)N2gs z5Ol*BNGFD+Q8RR-22%%Ne+VqwMyMhsS&cCT1W?hcEYO{yhUmg#{AZ1^#3Mg zU(IM7^$duN5()8%@-jKq%Ab`x_+qu4AC@1GjIR*4Rk%!ap`z79&dSx(smg$GSQ2U|6_x)xi(qk^Dn#%n}`6mw( z>|4vj9en@N7IhsMbd~tQ{4VJZpPJmsfy)-TNaDsx7ymZ7NxcKdpJl%AwlfLbzL&&{ zm)&xal^?w8P~FfRv+`YNt|zl?!7W$Vcss<5jq4!pt>f1h9O^QXnOVUkXep2647Cg62DPvLMRlNTX8oB1|G q%*A)Fc;z9D3$8lUl^2M#oXD7475~Ki4lbQ{tEpC^Upu*N-u)-!&#pEA delta 9856 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 Au>b%7 diff --git a/mozilla/cck/driver/WizardMachine.cpp b/mozilla/cck/driver/WizardMachine.cpp index 061c5ea80fe..d532302d168 100644 --- a/mozilla/cck/driver/WizardMachine.cpp +++ b/mozilla/cck/driver/WizardMachine.cpp @@ -34,6 +34,7 @@ #include "NewDialog.h" #include "NewConfigDialog.h" #include "ProgDlgThread.h" +#include "PropSheet.h" // for CopyDir #include "winbase.h" diff --git a/mozilla/cck/driver/WizardMachine.h b/mozilla/cck/driver/WizardMachine.h index 5711fa80c50..797d5c3f6e7 100644 --- a/mozilla/cck/driver/WizardMachine.h +++ b/mozilla/cck/driver/WizardMachine.h @@ -24,7 +24,7 @@ #endif #include "resource.h" // main symbols -#include "WizardMachineDlg.h" +//#include "WizardMachineDlg.h" #include "WizardTypes.h" diff --git a/mozilla/cck/driver/WizardMachine.mak b/mozilla/cck/driver/WizardMachine.mak index 95ec7466a65..d9110b201a9 100644 --- a/mozilla/cck/driver/WizardMachine.mak +++ b/mozilla/cck/driver/WizardMachine.mak @@ -1,6 +1,6 @@ # Microsoft Developer Studio Generated NMAKE File, Based on WizardMachine.dsp !IF "$(CFG)" == "" -CFG=WizardMachine - Win32 Release +CFG=WizardMachine - Win32 Debug !MESSAGE No configuration specified. Defaulting to WizardMachine - Win32 Release. !ENDIF diff --git a/mozilla/cck/driver/WizardMachine.ncb b/mozilla/cck/driver/WizardMachine.ncb index 4030559a35e76edbc6bdb841178a61ac4cb4c6f7..8aa5422e4b3bffbeccd611523b73a4ac0334ac32 100644 GIT binary patch delta 281 zcmZoT!PIbqX@UjojnG?+%9|T~jxuj%VqtS&0Fn$0CxCnq zeFI3_fW(0`2ax{*NV5QG4*m*82_P*2r8R&wNZbNSdqC+3AiX)oV-d4ZN^v7lo{7Pf u;V6)1WXR0fEaCG`UQnL_BA!wV5og#ep7T)}-CY@PTbY2`sO+wuIpP4*12kv= diff --git a/mozilla/cck/driver/WizardMachineDlg.cpp b/mozilla/cck/driver/WizardMachineDlg.cpp index 0d881b1a8f6..6a219fe95e7 100644 --- a/mozilla/cck/driver/WizardMachineDlg.cpp +++ b/mozilla/cck/driver/WizardMachineDlg.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "WizardMachine.h" +#include "WizardMachineDlg.h" //#include "ImageDialog.h" #include "ImgDlg.h" diff --git a/mozilla/cck/driver/WizardUI.cpp b/mozilla/cck/driver/WizardUI.cpp index f1ec2012984..d0fdf2005e4 100644 --- a/mozilla/cck/driver/WizardUI.cpp +++ b/mozilla/cck/driver/WizardUI.cpp @@ -21,8 +21,9 @@ // #include "stdafx.h" +#include "afxmt.h" + #include "WizardMachine.h" -//#include "ImageDialog.h" #include "fstream.h" #include "ImgDlg.h" #include "SumDlg.h" @@ -30,15 +31,16 @@ #include "NewDialog.h" #include "NewConfigDialog.h" #include "ProgDlgThread.h" +#include "PropSheet.h" +#include "WizardUI.h" + #include #include #include - // The following is included to make // the browse for a dir code compile #include - #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE diff --git a/mozilla/cck/driver/makefile.win b/mozilla/cck/driver/makefile.win index af97a9f0913..ec32bbd9ce2 100644 --- a/mozilla/cck/driver/makefile.win +++ b/mozilla/cck/driver/makefile.win @@ -42,6 +42,8 @@ LLFLAGS = \ INCS = -I. \ $(INCS) +# .\$(OBJDIR)\Interpret.obj \ + OBJS = \ .\$(OBJDIR)\HelpDlg.obj \ .\$(OBJDIR)\ImageDialog.obj \