From fbcb41664baa3006deb0a6d27ad1193fa792ea5e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 14 Sep 1998 16:37:24 +0000 Subject: [PATCH] DLL-related changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynarray.h | 13 +++++++++---- include/wx/stream.h | 2 +- include/wx/string.h | 4 ++-- src/msw/dummy.cpp | 2 +- src/msw/makefile.nt | 30 +++++++++++++++++++++++++----- 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 94dc5e1798..022701069e 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -64,7 +64,7 @@ typedef int (CMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2); @memo Base class for template array and list classes */ // ---------------------------------------------------------------------------- -class wxBaseArray +class WXDLLEXPORT wxBaseArray { public: /** @name ctors and dtor */ @@ -163,7 +163,7 @@ private: // ---------------------------------------------------------------------------- #define _WX_DEFINE_ARRAY(T, name) \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \ -class name : public wxBaseArray \ +class WXDLLEXPORTLOCAL name : public wxBaseArray \ { \ public: \ name() \ @@ -217,7 +217,7 @@ public: \ // ---------------------------------------------------------------------------- #define _WX_DEFINE_SORTED_ARRAY(T, name) \ typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2); \ -class name : public wxBaseArray \ +class WXDLLEXPORTLOCAL name : public wxBaseArray \ { \ public: \ name(SCMPFUNC##T fn) \ @@ -257,7 +257,7 @@ private: \ // ---------------------------------------------------------------------------- #define _WX_DECLARE_LIST(T, name) \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T** pItem1, T** pItem2); \ -class name : public wxBaseArray \ +class WXDLLEXPORTLOCAL name : public wxBaseArray \ { \ public: \ name() { } \ @@ -393,6 +393,8 @@ private: \ // # overhead if not used? // ---------------------------------------------------------------------------- +#define WXDLLEXPORTLOCAL WXDLLEXPORT + //@{ /** @name ArrayInt */ WX_DEFINE_ARRAY(int, wxArrayInt); @@ -404,5 +406,8 @@ WX_DEFINE_ARRAY(void *, wxArrayPtrVoid); //@} +#undef WXDLLEXPORTLOCAL +#define WXDLLEXPORTLOCAL + #endif // _DYNARRAY_H diff --git a/include/wx/stream.h b/include/wx/stream.h index 3013273cba..b6862e4f7f 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -190,7 +190,7 @@ class WXDLLEXPORT wxOutputStream { wxStreamBuffer *m_o_streambuf; }; -class wxStream: public virtual wxInputStream, +class WXDLLEXPORT wxStream: public virtual wxInputStream, public virtual wxOutputStream { public: diff --git a/include/wx/string.h b/include/wx/string.h index 592e5835f5..978ee25b77 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -182,7 +182,7 @@ struct WXDLLEXPORT wxStringData { #endif //WXSTRING_IS_WXOBJECT -friend class wxArrayString; +friend class WXDLLEXPORT wxArrayString; // NB: special care was taken in arrangin the member functions in such order // that all inline functions can be effectively inlined @@ -788,7 +788,7 @@ public: @memo probably the most commonly used array type - array of strings */ // ---------------------------------------------------------------------------- -class wxArrayString +class WXDLLEXPORT wxArrayString { public: /** @name ctors and dtor */ diff --git a/src/msw/dummy.cpp b/src/msw/dummy.cpp index 67004e57c8..50f5c99001 100644 --- a/src/msw/dummy.cpp +++ b/src/msw/dummy.cpp @@ -55,7 +55,7 @@ int PASCAL int APIENTRY #endif - WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR m_lpCmdLine, + WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR m_lpCmdLine, int nCmdShow ) { return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, m_lpCmdLine, nCmdShow); diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt index 1ce1786ca1..ba06ea9590 100644 --- a/src/msw/makefile.nt +++ b/src/msw/makefile.nt @@ -228,7 +228,7 @@ MSWOBJS = \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # Normal, static library -all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) +all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib $(LIBTARGET) # wxWindows library as DLL dll: @@ -279,7 +279,7 @@ $(WXDIR)\lib\wx200.dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\wx200.lib $(link) @<< $(LINKFLAGS) -out:$(WXDIR)\lib\wx200.dll - $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib + $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib << ######################################################## @@ -1140,13 +1140,33 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h # Peripheral components +png: + cd $(WXDIR)\src\png + nmake -f makefile.nt FINAL=$(FINAL) + cd $(WXDIR)\src\msw + +clean_png: + cd $(WXDIR)\src\png + nmake -f makefile.nt clean + cd $(WXDIR)\src\msw + +zlib: + cd $(WXDIR)\src\zlib + nmake -f makefile.nt FINAL=$(FINAL) + cd $(WXDIR)\src\msw + +clean_zlib: + cd $(WXDIR)\src\zlib + nmake -f makefile.nt clean + cd $(WXDIR)\src\msw + xpm: - cd $(WXDIR)\contrib\wxxpm + cd $(WXDIR)\src\wxxpm nmake -f makefile.nt FINAL=$(FINAL) cd $(WXDIR)\src\msw clean_xpm: - cd $(WXDIR)\contrib\wxxpm + cd $(WXDIR)\src\wxxpm nmake -f makefile.nt clean cd $(WXDIR)\src\msw @@ -1170,7 +1190,7 @@ clean_rcp: nmake -f makefile.nt clean cd $(WXDIR)\src\msw -clean: $(PERIPH_CLEAN_TARGET) +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib -erase *.obj -erase $(LIBTARGET) -erase $(WXDIR)\lib\*.pdb -- 2.45.2