Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DLL-related changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-09-14 16:37:24 +00:00
parent 8fdca65cf2
commit fbcb41664b
5 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/dynarray.h
View File

@@ -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

2
include/wx/stream.h
View File

@@ -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:

4
include/wx/string.h
View File

@@ -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 */

2
src/msw/dummy.cpp
View File

@@ -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);

30
src/msw/makefile.nt
View File

@@ -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