no message

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index a58714daa6e2484166c8a11e8a4ef15e06e180bb..53f68e1e7a5358dc0998b656bfdca2ee6f414733 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -24,7 +24,7 @@ typedef   unsigned int  size_t;
 
 class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
 
-class wxCheckListBox : public wxListBox
+class WXDLLEXPORT wxCheckListBox : public wxListBox
 {
   DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 public:

diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index 6d214806e944357390665fa6bfd4684e39369bd7..331ee3f46989f46daf719a505a7b6e8095d08b9b 100644 (file)
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -36,7 +36,7 @@
 // same as appname). The file name (strAppName parameter) may, in fact,
 // contain the full path to the file. If it doesn't, the file is searched for
 // in the Windows directory.
-class wxIniConfig : public wxConfigBase
+class WXDLLEXPORT wxIniConfig : public wxConfigBase
 {
 public:
   // ctor & dtor
@@ -105,4 +105,4 @@ private:
            m_strPath;     // the rest of the path (no trailing '_'!)
 };
 
-#endif  //_INICONF_H
\ No newline at end of file
+#endif  //_INICONF_H

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 5d8b9fc39a21c9508b551f5ab41e9be7f724ec1e..f9fd74eb902c75938df236ea628c21c90a54269f 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -24,7 +24,7 @@
 // wxRegConfig
 // ----------------------------------------------------------------------------
 
-class wxRegConfig : public wxConfigBase
+class WXDLLEXPORT wxRegConfig : public wxConfigBase
 {
 public:
   // ctor & dtor

diff --git a/utils/glcanvas/samples/cube/makefile.nt b/utils/glcanvas/samples/cube/makefile.nt
index f1d9e289a24753a97fe3952e90c916e898fa62f2..7f6d11c680f52e6c3cdd2878ad77ced36ab99307 100644 (file)
--- a/utils/glcanvas/samples/cube/makefile.nt
+++ b/utils/glcanvas/samples/cube/makefile.nt
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 WXUSINGDLL=0
 
 EXTRAINC=-I..\..\win
-EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu.lib opengl.lib
+EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib
 
 !include $(WXDIR)\src\ntwxwin.mak
 

diff --git a/utils/glcanvas/samples/isosurf/makefile.nt b/utils/glcanvas/samples/isosurf/makefile.nt
index 2a1f6070b7032bb823b51ae91201485718a62c1a..8f82c734b92cac4b312c8f512b37fe53e4803adf 100644 (file)
--- a/utils/glcanvas/samples/isosurf/makefile.nt
+++ b/utils/glcanvas/samples/isosurf/makefile.nt
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 WXUSINGDLL=0
 
 EXTRAINC=-I..\..\win
-EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu.lib opengl.lib
+EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib
 
 !include $(WXDIR)\src\ntwxwin.mak
 

diff --git a/utils/wxMMedia/cdbase.cpp b/utils/wxMMedia/cdbase.cpp
index ea988372d7434fbcee38102adce2a6c27853d8e8..34348d8421229ebb463503458ddef2b8eb6ec06d 100644 (file)
--- a/utils/wxMMedia/cdbase.cpp
+++ b/utils/wxMMedia/cdbase.cpp
@@ -10,6 +10,7 @@
 #ifdef __GNUG__
 #pragma implementation
 #endif
+#include "wx/wxprec.h"
 #include "cdbase.h"
 
 #ifdef __BORLANDC__

diff --git a/utils/wxMMedia/makefile.nt b/utils/wxMMedia/makefile.nt
index bc22ab08cab65dfe399cf05476326351937d28d2..6c7808adb9b797478db1f052cdff5bc0edcc7bb2 100644 (file)
--- a/utils/wxMMedia/makefile.nt
+++ b/utils/wxMMedia/makefile.nt
@@ -9,9 +9,7 @@
 # Makefile : Builds wxSock library for Windows NT / Win95
 
 # Change WXDIR or WXWIN to wherever wxWindows is found
-#WXWIN = $(WX)
-WXDIR = $(WXWIN)
-!include $(WXWIN)\src\ntwxwin.mak
+!include <..\..\src\ntwxwin.mak>
 
 WXMMEDDIR = $(WXDIR)\utils\wxmmedia
 WXMMEDINC = $(WXMMEDDIR)
@@ -24,7 +22,7 @@ LIBS=$(WXSOCKLIB) $(LIBS)
 #LIBS=$(WXLIB) $(WXSTRINGLIB) oldnames libw llibcew llibce commdlg shell
 
 OBJECTS = mmdata.obj mmfile.obj sndfile.obj sndsnd.obj sndwin.obj\
-       sndwav.obj sndfrag.obj vidbdrv.obj
+       sndwav.obj sndfrag.obj vidbase.obj
 
 all: $(WXMMEDLIB)
 
@@ -43,44 +41,44 @@ $(WXMMEDLIB): $(OBJECTS)
 $(OBJECTS)
 <<
 
-MMD_data.obj: MMD_data.$(SRCSUFF)
+MMdata.obj: MMdata.$(SRCSUFF)
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-MMD_file.obj: MMD_file.$(SRCSUFF)
+MMfile.obj: MMfile.$(SRCSUFF)
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-SND_file.obj: SND_file.$(SRCSUFF) SND_file.h
+SNDfile.obj: SNDfile.$(SRCSUFF) SNDfile.h
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-SND_wav.obj: SND_wav.$(SRCSUFF) SCK_wav.h
+SNDwav.obj: SNDwav.$(SRCSUFF) SNDwav.h
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-SND_sound.obj: SND_sound.$(SRCSUFF) SND_sound.h
+SNDwin.obj: SNDwin.$(SRCSUFF) SNDwin.h
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-SND_sound.obj: SND_sound.$(SRCSUFF) SND_sound.h
+SNDsnd.obj: SNDsnd.$(SRCSUFF) SNDsnd.h
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-SND_frag.obj: SND_frag.$(SRCSUFF) SND_frag.h
+SNDfrag.obj: SNDfrag.$(SRCSUFF) SNDfrag.h
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-VID_bdrv.obj: VID_bdrv.$(SRCSUFF) VID_bdrv.h
+VIDbase.obj: VIDbase.$(SRCSUFF) VIDbase.h
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
 clean:

diff --git a/utils/wxMMedia/mmdata.cpp b/utils/wxMMedia/mmdata.cpp
index 11b0922cf6e53a8f7c16d39c4a3b702f1c55b40b..a89cae04e451e2fc53778cb85fb2b67fff8e75d6 100644 (file)
--- a/utils/wxMMedia/mmdata.cpp
+++ b/utils/wxMMedia/mmdata.cpp
@@ -7,6 +7,8 @@
 // Copyright:  (C) 1997, 1998, Guilhem Lavaux
 // License:    wxWindows license
 ////////////////////////////////////////////////////////////////////////////////
+#include "wx/wxprec.h"
+
 #include "mmfile.h"
 
 #include "sndsnd.h"

diff --git a/utils/wxMMedia/mmfile.h b/utils/wxMMedia/mmfile.h
index 29b39688218afe3312bb25093ef897aeb9e00443..e6a3ccd20e8116c6ad2cb60df4852c0d85197d90 100644 (file)
--- a/utils/wxMMedia/mmfile.h
+++ b/utils/wxMMedia/mmfile.h
@@ -14,11 +14,6 @@
 #pragma interface
 #endif
 
-#ifdef WX_PRECOMP
-#include "wx_prec.h"
-#else
-#include "wx/wx.h"
-#endif
 #include "wx/string.h"
 #include "wx/stream.h"
 #include "mmtype.h"