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

Made changes to allow build with new mingw32/gcc-2.95

Browse Source 
added wxUSE_NORLANDER_HEADERS for mingw32/gcc-2.95


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
J. Russell Smyth
1999-08-04 00:42:51 +00:00
parent ea8fe90e65
commit 65fd5cb012
34 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/defs.h
View File

@@ -129,6 +129,14 @@
#if defined(__HPUX__) && defined(__GNUG__) #if defined(__HPUX__) && defined(__GNUG__)
#define va_list __gnuc_va_list #define va_list __gnuc_va_list
#endif // HP-UX #endif // HP-UX
// Mingw32 gcc-2.95 uses new windows headers which are more ms-like
// we are setting this define because of the complex check
// using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
#if defined(__MINGW32__) && (__GNUC__>=2) && (__GNUC_MINOR__>=95)
# define wxUSE_NORLANDER_HEADERS 1
#endif
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
// Currently Only MS-Windows/NT, XView and Motif are supported // Currently Only MS-Windows/NT, XView and Motif are supported

4
include/wx/msw/private.h
View File

@@ -56,7 +56,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
// window proc // window proc
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#if defined(__GNUWIN32__) #if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
# define CASTWNDPROC (long unsigned) # define CASTWNDPROC (long unsigned)
#else #else
# ifdef __BORLANDC__ # ifdef __BORLANDC__
@@ -69,7 +69,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
# endif # endif
# else # else
# if defined (__WIN32__) && defined(STRICT) # if defined (__WIN32__) && defined(STRICT)
typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long); typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
# define CASTWNDPROC (WndProcCast) # define CASTWNDPROC (WndProcCast)
# elif defined(__WIN16__) # elif defined(__WIN16__)

2
include/wx/msw/registry.h
View File

@@ -125,7 +125,7 @@ public:
bool Exists() const; bool Exists() const;
// get the info about key (any number of these pointers may be NULL) // get the info about key (any number of these pointers may be NULL)
#ifdef __GNUWIN32__ #if defined( __GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
bool GetKeyInfo(size_t *pnSubKeys, // number of subkeys bool GetKeyInfo(size_t *pnSubKeys, // number of subkeys
size_t *pnMaxKeyLen, // max len of subkey name size_t *pnMaxKeyLen, // max len of subkey name
size_t *pnValues, // number of values size_t *pnValues, // number of values

2
src/common/dynlib.cpp
View File

@@ -276,7 +276,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
// wxLibraries (only one instance should normally exist) // wxLibraries (only one instance should normally exist)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
wxLibraries::wxLibraries() wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)
{ {
} }

2
src/generic/tipdlg.cpp
View File

@@ -152,7 +152,7 @@ wxString wxFileTipProvider::GetTip()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxTipDialog, wxDialog) BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
EVT_BUTTON(wxID_NEXT_TIP, OnNextTip) EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
END_EVENT_TABLE() END_EVENT_TABLE()
wxTipDialog::wxTipDialog(wxWindow *parent, wxTipDialog::wxTipDialog(wxWindow *parent,

2
src/msw/app.cpp
View File

@@ -82,7 +82,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/checklst.cpp
View File

@@ -45,7 +45,7 @@
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#ifdef __GNUWIN32__ #if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif

2
src/msw/control.cpp
View File

@@ -30,7 +30,7 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/curico.cpp
View File

@@ -25,7 +25,7 @@
#endif #endif
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #if defined (__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif #endif

3
src/msw/dc.cpp
View File

@@ -46,6 +46,9 @@
#include <math.h> #include <math.h>
#if wxUSE_COMMON_DIALOGS #if wxUSE_COMMON_DIALOGS
#if wxUSE_NORLANDER_HEADERS
#include <windows.h>
#endif
#include <commdlg.h> #include <commdlg.h>
#endif #endif

2
src/msw/dde.cpp
View File

@@ -39,10 +39,12 @@
#include <ddeml.h> #include <ddeml.h>
#ifndef __TWIN32__ #ifndef __TWIN32__
#if !wxUSE_NORLANDER_HEADERS
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif #endif
#endif
#include <string.h> #include <string.h>

2
src/msw/dib.cpp
View File

@@ -49,10 +49,12 @@
#include "wx/msw/dib.h" #include "wx/msw/dib.h"
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif #endif
#endif
#ifndef SEEK_CUR #ifndef SEEK_CUR
/* flags for _lseek */ /* flags for _lseek */

2
src/msw/dibutils.cpp
View File

@@ -167,7 +167,7 @@ int DibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
bmf.bfReserved1 = 0; bmf.bfReserved1 = 0;
bmf.bfReserved2 = 0; bmf.bfReserved2 = 0;
bmf.bfOffBits = sizeof(bmf) + (char FAR*)(DibPtr(lpbi)) - (char FAR*)lpbi; bmf.bfOffBits = sizeof(bmf) + (char FAR*)(DibPtr(lpbi)) - (char FAR*)lpbi;
#if defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) #if defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) || defined(wxUSE_NORLANDER_HEADERS)
if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 || if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||
_hwrite(fh, (LPCSTR)lpbi, size)<0) { _hwrite(fh, (LPCSTR)lpbi, size)<0) {
_lclose(fh); _lclose(fh);

2
src/msw/dragimag.cpp
View File

@@ -38,7 +38,7 @@
#include "wx/msw/dragimag.h" #include "wx/msw/dragimag.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/gauge95.cpp
View File

@@ -29,7 +29,7 @@
#include "wx/msw/gauge95.h" #include "wx/msw/gauge95.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/imaglist.cpp
View File

@@ -37,7 +37,7 @@
#include "wx/msw/imaglist.h" #include "wx/msw/imaglist.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

4
src/msw/joystick.cpp
View File

@@ -24,7 +24,7 @@
#include "wx/window.h" #include "wx/window.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#ifndef __GNUWIN32__ #if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
#include <mmsystem.h> #include <mmsystem.h>
#endif #endif
@@ -34,9 +34,11 @@ typedef UINT MMRESULT;
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include <wx/msw/gnuwin32/extra.h> #include <wx/msw/gnuwin32/extra.h>
#endif #endif
#endif #endif
#endif
// Why doesn't BC++ have joyGetPosEx? // Why doesn't BC++ have joyGetPosEx?
#if !defined(__WIN32__) || defined(__BORLANDC__) || defined(__TWIN32__) #if !defined(__WIN32__) || defined(__BORLANDC__) || defined(__TWIN32__)

4
src/msw/listbox.cpp
View File

@@ -49,7 +49,9 @@
#ifndef __TWIN32__ #ifndef __TWIN32__
#if defined(__GNUWIN32__) #if defined(__GNUWIN32__)
#include <wx/msw/gnuwin32/extra.h> #ifndef wxUSE_NORLANDER_HEADERS
#include <wx/msw/gnuwin32/extra.h>
#endif
#endif #endif
#endif #endif

2
src/msw/listctrl.cpp
View File

@@ -39,7 +39,7 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#ifdef __GNUWIN32__ #if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#else #else
#include <commctrl.h> #include <commctrl.h>

2
src/msw/minifram.cpp
View File

@@ -36,9 +36,11 @@
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif #endif
#endif
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)

4
src/msw/notebook.cpp
View File

@@ -42,11 +42,13 @@
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif #endif
#endif
#if !defined(__GNUWIN32__) || defined(__TWIN32__) #if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/registry.cpp
View File

@@ -302,7 +302,7 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
return str; return str;
} }
#ifdef __GNUWIN32__ #if defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
bool wxRegKey::GetKeyInfo(size_t* pnSubKeys, bool wxRegKey::GetKeyInfo(size_t* pnSubKeys,
size_t* pnMaxKeyLen, size_t* pnMaxKeyLen,
size_t* pnValues, size_t* pnValues,

2
src/msw/slider95.cpp
View File

@@ -31,7 +31,7 @@
#include "wx/msw/slider95.h" #include "wx/msw/slider95.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/spinbutt.cpp
View File

@@ -32,7 +32,7 @@
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if !defined(__GNUWIN32__) || defined(__TWIN32__) #if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/statbr95.cpp
View File

@@ -36,7 +36,7 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include <windowsx.h> #include <windowsx.h>
#if !defined(__GNUWIN32__) || defined(__TWIN32__) #if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif

4
src/msw/tabctrl.cpp
View File

@@ -32,15 +32,17 @@
#include <windows.h> #include <windows.h>
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif #endif
#endif
#include "wx/msw/dib.h" #include "wx/msw/dib.h"
#include "wx/msw/tabctrl.h" #include "wx/msw/tabctrl.h"

2
src/msw/taskbar.cpp
View File

@@ -37,9 +37,11 @@
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include <wx/msw/gnuwin32/extra.h> #include <wx/msw/gnuwin32/extra.h>
#endif #endif
#endif #endif
#endif
#ifdef __SALFORDC__ #ifdef __SALFORDC__
#include <shellapi.h> #include <shellapi.h>

4
src/msw/tbar95.cpp
View File

@@ -32,15 +32,17 @@
#include <windows.h> #include <windows.h>
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif #endif
#endif
#include "wx/msw/dib.h" #include "wx/msw/dib.h"
#include "wx/tbar95.h" #include "wx/tbar95.h"

2
src/msw/textctrl.cpp
View File

@@ -57,7 +57,7 @@
# include <fstream> # include <fstream>
#endif #endif
#if wxUSE_RICHEDIT && !defined(__GNUWIN32__) #if wxUSE_RICHEDIT && (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
#include <richedit.h> #include <richedit.h>
#endif #endif

4
src/msw/tooltip.cpp
View File

@@ -32,7 +32,7 @@
#include "wx/tooltip.h" #include "wx/tooltip.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif
@@ -47,7 +47,7 @@ public:
wxToolInfo(wxWindow *win) wxToolInfo(wxWindow *win)
{ {
// initialize all members // initialize all members
#ifdef __GNUWIN32__ #if defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
memset(this, 0, sizeof(TOOLINFO)); memset(this, 0, sizeof(TOOLINFO));
#else #else
::ZeroMemory(this, sizeof(TOOLINFO)); ::ZeroMemory(this, sizeof(TOOLINFO));

6
src/msw/treectrl.cpp
View File

@@ -47,10 +47,12 @@
#include "wx/treectrl.h" #include "wx/treectrl.h"
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif
@@ -195,7 +197,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
if ( m_windowStyle & wxTR_LINES_AT_ROOT ) if ( m_windowStyle & wxTR_LINES_AT_ROOT )
wstyle |= TVS_LINESATROOT; wstyle |= TVS_LINESATROOT;
#ifndef __GNUWIN32__ #if !defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
// we emulate the multiple selection tree controls by using checkboxes: set // we emulate the multiple selection tree controls by using checkboxes: set
// up the image list we need for this if we do have multiple selections // up the image list we need for this if we do have multiple selections
if ( m_windowStyle & wxTR_MULTIPLE ) if ( m_windowStyle & wxTR_MULTIPLE )

4
src/msw/wave.cpp
View File

@@ -31,15 +31,17 @@
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#ifndef __GNUWIN32__ #if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
#include <mmsystem.h> #include <mmsystem.h>
#endif #endif
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif #endif
#endif
wxWave::wxWave() wxWave::wxWave()
: m_waveData(NULL), m_waveLength(0), m_isResource(FALSE) : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)

8
src/msw/window.cpp
View File

@@ -80,7 +80,7 @@
#include <string.h> #include <string.h>
#ifndef __GNUWIN32__ #if !defined(__GNUWIN32__)|| defined(wxUSE_NORLANDER_HEADERS)
#include <shellapi.h> #include <shellapi.h>
#include <mmsystem.h> #include <mmsystem.h>
#endif #endif
@@ -89,13 +89,15 @@
#include <windowsx.h> #include <windowsx.h>
#endif #endif
#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ ) #if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h> #include <commctrl.h>
#endif #endif
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
#include <wx/msw/gnuwin32/extra.h> #ifndef wxUSE_NORLANDER_HEADERS
#include <wx/msw/gnuwin32/extra.h>
#endif
#endif #endif
#endif #endif

2
utils/wxtree/src/makefile.g95
View File

@@ -7,7 +7,7 @@
# #
# Makefile for wxWindows sample (Cygwin/Mingw32). # Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../../.. WXDIR = $(WXWIN)
TARGET=test TARGET=test
OBJECTS = $(TARGET).o wxtree.o OBJECTS = $(TARGET).o wxtree.o