Removed strange wxFAIL; added dialup.cpp to filelist.txt

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-11-24 12:14:24 +00:00
parent 82a564fa35
commit 162999bfb7
4 changed files with 22 additions and 12 deletions

View File

@ -215,6 +215,7 @@ dcprint.cpp M
dcscreen.cpp M
dde.cpp M
dialog.cpp M
dialup.cpp M
dib.cpp M
dibutils.cpp M
dirdlg.cpp M 32

View File

@ -46,8 +46,11 @@ class WXDLLEXPORT wxMenuItemBase : public wxObject
{
public:
// some compilers need a default constructor here, do not use
wxMenuItemBase()
wxMenuItemBase() {}
/* This makes no sense (lots of asserts on MSW) so commenting out -- JACS
{ wxFAIL_MSG( wxT("illegal call") ); }
*/
// creation
static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,

View File

@ -373,7 +373,12 @@ void MyFrame::DoEnablePrint()
void MyFrame::DoDeletePrint()
{
wxToolBar *tb = GetToolBar();
// Not implemented in MSW
#ifdef __WXMSW__
wxMessageBox("Sorry, wxToolBar::DeleteTool is not implemented under Windows.");
#else
tb->DeleteTool( wxID_PRINT );
#endif
}
void MyFrame::DoToggleHelp()

View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 14:24, 1999/11/15
# This file was automatically generated by tmake at 10:51, 1999/11/24
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
@ -248,6 +248,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
..\msw\$D\dcscreen.obj \
..\msw\$D\dde.obj \
..\msw\$D\dialog.obj \
..\msw\$D\dialup.obj \
..\msw\$D\dib.obj \
..\msw\$D\dibutils.obj \
..\msw\$D\dirdlg.obj \
@ -283,6 +284,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
..\msw\$D\palette.obj \
..\msw\$D\pen.obj \
..\msw\$D\penwin.obj \
..\msw\$D\pnghand.obj \
..\msw\$D\printdlg.obj \
..\msw\$D\printwin.obj \
..\msw\$D\radiobox.obj \
@ -308,7 +310,6 @@ MSWOBJS = ..\msw\$D\accel.obj \
..\msw\$D\timer.obj \
..\msw\$D\tooltip.obj \
..\msw\$D\treectrl.obj \
..\msw\$D\pnghand.obj \
..\msw\$D\utils.obj \
..\msw\$D\utilsexc.obj \
..\msw\ole\$D\uuid.obj \
@ -350,22 +351,22 @@ test: $(MSWDIR)\$D\wave.obj
test2: ..\common\Debug\config.obj
$D:
md $D
mkdir $D
$(COMMDIR)\$D:
md $(COMMDIR)\$D
mkdir $(COMMDIR)\$D
$(MSWDIR)\$D:
md $(MSWDIR)\$D
mkdir $(MSWDIR)\$D
$(GENDIR)\$D:
md $(GENDIR)\$D
mkdir $(GENDIR)\$D
$(OLEDIR)\$D:
md $(OLEDIR)\$D
mkdir $(OLEDIR)\$D
$(HTMLDIR)\$D:
md $(HTMLDIR)\$D
mkdir $(HTMLDIR)\$D
# wxWindows library as DLL
dll:
@ -727,7 +728,7 @@ $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
$(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
cd $(DOCDIR)\latex\wx
-md $(DOCDIR)\html\wx
-mkdir $(DOCDIR)\html\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-erase $(DOCDIR)\html\wx\*.con
-erase $(DOCDIR)\html\wx\*.ref
@ -743,7 +744,7 @@ $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex
cd $(DOCDIR)\latex\porting
-md $(DOCDIR)\html\porting
-mkdir $(DOCDIR)\html\porting
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
-erase $(DOCDIR)\html\porting\*.con
-erase $(DOCDIR)\html\porting\*.ref
@ -753,7 +754,7 @@ $(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex
$(DOCDIR)\html\proplist\prop.htm: $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex
cd $(DOCDIR)\latex\proplist
-md $(DOCDIR)\html\proplist
-mkdir $(DOCDIR)\html\proplist
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html
-erase $(DOCDIR)\html\proplist\*.con
-erase $(DOCDIR)\html\proplist\*.ref