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

Fixed from Mumit Khan to allow DLL compilation for mingw32

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-01-10 01:00:13 +00:00
parent 6f4968e281
commit 31e78e0cb6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dobjcmn.cpp
View File

@@ -47,7 +47,7 @@ WX_DEFINE_LIST(wxSimpleDataObjectList);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static wxDataFormat dataFormatInvalid; static wxDataFormat dataFormatInvalid;
const wxDataFormat& wxFormatInvalid = dataFormatInvalid; WXDLLEXPORT const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
// ============================================================================ // ============================================================================
// implementation // implementation

2
src/common/zstream.cpp
View File

@@ -32,7 +32,7 @@
// If we are building with configure (defines __WX_SETUP_H__), // If we are building with configure (defines __WX_SETUP_H__),
// we trust the zlib path is given as a -I option. // we trust the zlib path is given as a -I option.
#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) #if defined(__WXMSW__) && !defined(__WX_SETUP_H__)
#include "..\zlib\zlib.h" #include "../zlib/zlib.h"
#else #else
#include "zlib.h" #include "zlib.h"
#endif #endif

2
src/generic/numdlgg.cpp
View File

@@ -48,7 +48,7 @@
#include "wx/spinctrl.h" #include "wx/spinctrl.h"
// this is where wxGetNumberFromUser() is declared // this is where wxGetNumberFromUser() is declared
#include "wx/generic/textdlgg.h" #include "wx/textdlgg.h"
#if !wxUSE_SPINCTRL #if !wxUSE_SPINCTRL
// wxTextCtrl will do instead of wxSpinCtrl if we don't have it // wxTextCtrl will do instead of wxSpinCtrl if we don't have it

2
src/msw/app.cpp
View File

@@ -1270,6 +1270,6 @@ wxApp::GetStdIcon(int which) const
// For some reason, with MSVC++ 1.5, WinMain isn't linked in properly // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
// if in a separate file. So include it here to ensure it's linked. // if in a separate file. So include it here to ensure it's linked.
#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__)) #if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL))
#include "main.cpp" #include "main.cpp"
#endif #endif