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

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index c79912a50ed373f7d6d8170bbf46c29a09d36184..8807a1492e4d4d3124ef80d429ba621d186b110b 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -215,6 +215,7 @@ dcprint.cpp M
 dcscreen.cpp   M
 dde.cpp        M
 dialog.cpp     M
 dcscreen.cpp   M
 dde.cpp        M
 dialog.cpp     M

+dialup.cpp     M

 dib.cpp        M
 dibutils.cpp   M
 dirdlg.cpp     M       32
 dib.cpp        M
 dibutils.cpp   M
 dirdlg.cpp     M       32

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 22bfd7c36b639625323c5b85d3e7decb768858c5..74bbc43f3dc63059efd69d90f8c95ac375b87728 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -46,8 +46,11 @@ class WXDLLEXPORT wxMenuItemBase : public wxObject
 {
 public:
     // some compilers need a default constructor here, do not use
 {
 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") ); }
         { wxFAIL_MSG( wxT("illegal call") ); }

+*/

 
     // creation
     static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,
 
     // creation
     static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,

diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
index e28ab1498155ffd8fee9befe86c7363675edee87..43bd0d143c6aa99642df4864f697eab2c62e5860 100644 (file)
--- a/samples/toolbar/test.cpp
+++ b/samples/toolbar/test.cpp
@@ -373,7 +373,12 @@ void MyFrame::DoEnablePrint()
 void MyFrame::DoDeletePrint()
 {
     wxToolBar *tb = GetToolBar();
 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 );
     tb->DeleteTool( wxID_PRINT );

+#endif

 }
 
 void MyFrame::DoToggleHelp()
 }
 
 void MyFrame::DoToggleHelp()

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 1d31f29421c07977f0596fab56756aeae45304a7..7f23a3faa3e1414632ad547b32a0bbdc9bbfc081 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -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
 # 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\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 \
                ..\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\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 \
                ..\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\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 \
                ..\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:
 test2:  ..\common\Debug\config.obj
 
 $D:

-    md $D
+    mkdir $D

 
 $(COMMDIR)\$D:
 
 $(COMMDIR)\$D:

-    md $(COMMDIR)\$D
+    mkdir $(COMMDIR)\$D

 
 $(MSWDIR)\$D:
 
 $(MSWDIR)\$D:

-    md $(MSWDIR)\$D
+    mkdir $(MSWDIR)\$D

 
 $(GENDIR)\$D:
 
 $(GENDIR)\$D:

-    md $(GENDIR)\$D
+    mkdir $(GENDIR)\$D

 
 $(OLEDIR)\$D:
 
 $(OLEDIR)\$D:

-    md $(OLEDIR)\$D
+    mkdir $(OLEDIR)\$D

 
 $(HTMLDIR)\$D:
 
 $(HTMLDIR)\$D:

-    md $(HTMLDIR)\$D
+    mkdir $(HTMLDIR)\$D

 
 # wxWindows library as DLL
 dll:
 
 # 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
 
 $(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
         -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
 
 $(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
         -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
 
 $(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
         -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