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

Applied patch [ 736322 ] Remove TWINE support, merge it in Wine.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-05-23 19:16:45 +00:00
parent d726047819
commit b39dbf34b8
39 changed files with 83 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/html/faqmsw.htm
View File

@@ -63,14 +63,13 @@ makefiles to see what other files have been left out.
16-bit compilation is supported under Visual C++ 1.5, and Borland BC++ 4 to 5. 16-bit compilation is supported under Visual C++ 1.5, and Borland BC++ 4 to 5.
<P> <P>
wxWindows 2 for Windows will also compile on Unix with gcc using TWIN32 from <a href="http://www.willows.com" target=_top>Willows</a>, wxWindows 2 for Windows will also compile on Unix with gcc using Wine from <a href="http://www.winehq.org" target=_top>WineHQ</a>.
although TWIN32 is still in a preliminary state. The resulting executables are The resulting executables are Unix binaries that work with the Wine Windows API emulator.<P>
Unix binaries that work with the TWIN32 Windows API emulator.<P>
You can also compile wxWindows 2 for Windows on Unix with Cygwin or Mingw32, resulting You can also compile wxWindows 2 for Windows on Unix with Cygwin or Mingw32, resulting
in executables that will run on Windows. So in theory you could write your applications in executables that will run on Windows. So in theory you could write your applications
using wxGTK or wxMotif, then check/debug your wxWindows for Windows using wxGTK or wxMotif, then check/debug your wxWindows for Windows
programs with TWIN32, and finally produce an ix86 Windows executable using Cygwin/Mingw32, programs with Wine, and finally produce an ix86 Windows executable using Cygwin/Mingw32,
without ever needing a copy of Microsoft Windows. See the Technical Note on the Web site detailing cross-compilation.<P> without ever needing a copy of Microsoft Windows. See the Technical Note on the Web site detailing cross-compilation.<P>
<h3><a name="wince">What about Windows CE?</a></h3> <h3><a name="wince">What about Windows CE?</a></h3>

12
include/wx/mac/setup0.h
View File

@@ -975,7 +975,7 @@
// //
// Recommended setting: 1, only set it to 0 if your compiler doesn't have // Recommended setting: 1, only set it to 0 if your compiler doesn't have
// or can't compile <richedit.h> // or can't compile <richedit.h>
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT 1
// TODO: This should be ifdef'ed for any compilers that don't support // TODO: This should be ifdef'ed for any compilers that don't support
@@ -1086,16 +1086,6 @@
#define wxUSE_OWNER_DRAWN 0 #define wxUSE_OWNER_DRAWN 0
#endif // __SALFORDC__ #endif // __SALFORDC__
#ifdef __TWIN32__
#undef wxUSE_THREADS
#define wxUSE_THREADS 0
#undef wxUSE_ODBC
#define wxUSE_ODBC 0
#endif // __TWIN32__
// BC++/Win16 can't cope with the amount of data in resource.cpp // BC++/Win16 can't cope with the amount of data in resource.cpp
#if defined(__WIN16__) && defined(__BORLANDC__) #if defined(__WIN16__) && defined(__BORLANDC__)
#undef wxUSE_WX_RESOURCES #undef wxUSE_WX_RESOURCES

12
include/wx/msw/setup0.h
View File

@@ -1012,7 +1012,7 @@
// //
// Recommended setting: 1, only set it to 0 if your compiler doesn't have // Recommended setting: 1, only set it to 0 if your compiler doesn't have
// or can't compile <richedit.h> // or can't compile <richedit.h>
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT 1
// TODO: This should be ifdef'ed for any compilers that don't support // TODO: This should be ifdef'ed for any compilers that don't support
@@ -1134,16 +1134,6 @@
#define wxUSE_OWNER_DRAWN 0 #define wxUSE_OWNER_DRAWN 0
#endif // __SALFORDC__ #endif // __SALFORDC__
#ifdef __TWIN32__
#undef wxUSE_THREADS
#define wxUSE_THREADS 0
#undef wxUSE_ODBC
#define wxUSE_ODBC 0
#endif // __TWIN32__
// BC++/Win16 can't cope with the amount of data in resource.cpp // BC++/Win16 can't cope with the amount of data in resource.cpp
#if defined(__WIN16__) && defined(__BORLANDC__) #if defined(__WIN16__) && defined(__BORLANDC__)
#undef wxUSE_WX_RESOURCES #undef wxUSE_WX_RESOURCES

12
include/wx/msw/setup_microwin.h
View File

@@ -975,7 +975,7 @@
// //
// Recommended setting: 1, only set it to 0 if your compiler doesn't have // Recommended setting: 1, only set it to 0 if your compiler doesn't have
// or can't compile <richedit.h> // or can't compile <richedit.h>
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT 1
// TODO: This should be ifdef'ed for any compilers that don't support // TODO: This should be ifdef'ed for any compilers that don't support
@@ -1091,16 +1091,6 @@
#define wxUSE_OWNER_DRAWN 0 #define wxUSE_OWNER_DRAWN 0
#endif // __SALFORDC__ #endif // __SALFORDC__
#ifdef __TWIN32__
#undef wxUSE_THREADS
#define wxUSE_THREADS 0
#undef wxUSE_ODBC
#define wxUSE_ODBC 0
#endif // __TWIN32__
// BC++/Win16 can't cope with the amount of data in resource.cpp // BC++/Win16 can't cope with the amount of data in resource.cpp
#if defined(__WIN16__) && defined(__BORLANDC__) #if defined(__WIN16__) && defined(__BORLANDC__)
#undef wxUSE_WX_RESOURCES #undef wxUSE_WX_RESOURCES

12
include/wx/msw/wince/setup.h
View File

@@ -1011,7 +1011,7 @@
// //
// Recommended setting: 1, only set it to 0 if your compiler doesn't have // Recommended setting: 1, only set it to 0 if your compiler doesn't have
// or can't compile <richedit.h> // or can't compile <richedit.h>
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT 1
// TODO: This should be ifdef'ed for any compilers that don't support // TODO: This should be ifdef'ed for any compilers that don't support
@@ -1133,16 +1133,6 @@
#define wxUSE_OWNER_DRAWN 0 #define wxUSE_OWNER_DRAWN 0
#endif // __SALFORDC__ #endif // __SALFORDC__
#ifdef __TWIN32__
#undef wxUSE_THREADS
#define wxUSE_THREADS 0
#undef wxUSE_ODBC
#define wxUSE_ODBC 0
#endif // __TWIN32__
// BC++/Win16 can't cope with the amount of data in resource.cpp // BC++/Win16 can't cope with the amount of data in resource.cpp
#if defined(__WIN16__) && defined(__BORLANDC__) #if defined(__WIN16__) && defined(__BORLANDC__)
#undef wxUSE_WX_RESOURCES #undef wxUSE_WX_RESOURCES

4
include/wx/platform.h
View File

@@ -76,10 +76,6 @@
#endif #endif
#endif /* WINE */ #endif /* WINE */
#if defined(TWIN32) && !defined(__TWIN32__)
#define __TWIN32__
#endif /* Twin32 */
/* /*
Include wx/setup.h for the Unix platform defines generated by configure and Include wx/setup.h for the Unix platform defines generated by configure and
the library compilation options the library compilation options

10
include/wx/univ/setup0.h
View File

@@ -1112,7 +1112,7 @@
// //
// Recommended setting: 1, only set it to 0 if your compiler doesn't have // Recommended setting: 1, only set it to 0 if your compiler doesn't have
// or can't compile <richedit.h> // or can't compile <richedit.h>
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
// TODO: This should be ifdef'ed for any compilers that don't support // TODO: This should be ifdef'ed for any compilers that don't support
// RichEdit 2.0 but do have RichEdit 1.0... // RichEdit 2.0 but do have RichEdit 1.0...
#define wxUSE_RICHEDIT 0 // currently not supported #define wxUSE_RICHEDIT 0 // currently not supported
@@ -1212,14 +1212,6 @@
#define wxUSE_OWNER_DRAWN 0 #define wxUSE_OWNER_DRAWN 0
#endif // __SALFORDC__ #endif // __SALFORDC__
#ifdef __TWIN32__
#undef wxUSE_THREADS
#define wxUSE_THREADS 0
#undef wxUSE_ODBC
#define wxUSE_ODBC 0
#endif // __TWIN32__
// BC++/Win16 can't cope with the amount of data in resource.cpp // BC++/Win16 can't cope with the amount of data in resource.cpp
#if defined(__WIN16__) && defined(__BORLANDC__) #if defined(__WIN16__) && defined(__BORLANDC__)
#undef wxUSE_WX_RESOURCES #undef wxUSE_WX_RESOURCES

2
setup.h.in
View File

@@ -136,7 +136,7 @@
#endif #endif
/* enable rich edit under Win32 */ /* enable rich edit under Win32 */
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT 1
#else #else
#define wxUSE_RICHEDIT 0 #define wxUSE_RICHEDIT 0

2
setup.h_vms
View File

@@ -148,7 +148,7 @@
#endif #endif
/* enable rich edit under Win32 */ /* enable rich edit under Win32 */
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT 1
#else #else
#define wxUSE_RICHEDIT 0 #define wxUSE_RICHEDIT 0

4
src/common/filefn.cpp
View File

@@ -131,10 +131,6 @@
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <sys/cygwin.h> #include <sys/cygwin.h>
#endif #endif
#ifndef __TWIN32__
#include <sys/unistd.h>
#endif
#endif // __GNUWIN32__ #endif // __GNUWIN32__
#endif // __WINDOWS__ #endif // __WINDOWS__

6
src/msw/accel.cpp
View File

@@ -58,7 +58,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
if (m_hAccel) if (m_hAccel)
{ {
// This function not available in WIN16 // This function not available in WIN16
#if !defined(__WIN16__) && !defined(__TWIN32__) #if !defined(__WIN16__)
DestroyAcceleratorTable((HACCEL) m_hAccel); DestroyAcceleratorTable((HACCEL) m_hAccel);
#endif #endif
} }
@@ -80,7 +80,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
m_refData = new wxAcceleratorRefData; m_refData = new wxAcceleratorRefData;
HACCEL hAccel = HACCEL hAccel =
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
#ifdef UNICODE #ifdef UNICODE
::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource); ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
#else #else
@@ -96,7 +96,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
extern int wxCharCodeWXToMSW(int id, bool *isVirtual); extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
// Create from an array // Create from an array
#if !defined(__WIN16__) && !defined(__TWIN32__) #if !defined(__WIN16__)
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
{ {
// Not available in WIN16 // Not available in WIN16

4
src/msw/app.cpp
View File

@@ -84,7 +84,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif
@@ -1381,6 +1381,6 @@ void wxWakeUpIdle()
// 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(__WINE__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL)) #if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__WINE__) && !defined(WXMAKINGDLL))
#include "main.cpp" #include "main.cpp"
#endif #endif

2
src/msw/control.cpp
View File

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

2
src/msw/dde.cpp
View File

@@ -46,7 +46,7 @@
#include <windows.h> #include <windows.h>
#include <ddeml.h> #include <ddeml.h>
#if defined(__TWIN32__) || defined(__GNUWIN32_OLD__) #ifdef __GNUWIN32_OLD__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif

2
src/msw/dragimag.cpp
View File

@@ -51,7 +51,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_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/gauge95.cpp
View File

@@ -37,7 +37,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_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif

22
src/msw/imaglist.cpp
View File

@@ -46,7 +46,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_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif
@@ -162,10 +162,6 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
// 'bitmap'. // 'bitmap'.
int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour) int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
{ {
#ifdef __TWIN32__
wxFAIL_MSG(_T("ImageList_AddMasked not implemented in TWIN32"));
return -1;
#else
int index = ImageList_AddMasked(GetHImageList(), int index = ImageList_AddMasked(GetHImageList(),
GetHbitmapOf(bitmap), GetHbitmapOf(bitmap),
wxColourToRGB(maskColour)); wxColourToRGB(maskColour));
@@ -175,7 +171,6 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
} }
return index; return index;
#endif
} }
// Adds a bitmap and mask from an icon. // Adds a bitmap and mask from an icon.
@@ -196,10 +191,6 @@ int wxImageList::Add(const wxIcon& icon)
bool wxImageList::Replace(int index, bool wxImageList::Replace(int index,
const wxBitmap& bitmap, const wxBitmap& mask) const wxBitmap& bitmap, const wxBitmap& mask)
{ {
#ifdef __TWIN32__
wxFAIL_MSG(_T("ImageList_Replace not implemented in TWIN32"));
return FALSE;
#else
HBITMAP hbmpMask = GetMaskForImage(bitmap, mask); HBITMAP hbmpMask = GetMaskForImage(bitmap, mask);
bool ok = ImageList_Replace(GetHImageList(), index, bool ok = ImageList_Replace(GetHImageList(), index,
@@ -212,7 +203,6 @@ bool wxImageList::Replace(int index,
::DeleteObject(hbmpMask); ::DeleteObject(hbmpMask);
return ok; return ok;
#endif
} }
// Replaces a bitmap and mask from an icon. // Replaces a bitmap and mask from an icon.
@@ -230,10 +220,6 @@ bool wxImageList::Replace(int i, const wxIcon& icon)
// Removes the image at the given index. // Removes the image at the given index.
bool wxImageList::Remove(int index) bool wxImageList::Remove(int index)
{ {
#ifdef __TWIN32__
wxFAIL_MSG(_T("ImageList_Replace not implemented in TWIN32"));
return FALSE;
#else
bool ok = ImageList_Remove(GetHImageList(), index) != 0; bool ok = ImageList_Remove(GetHImageList(), index) != 0;
if ( !ok ) if ( !ok )
{ {
@@ -241,7 +227,6 @@ bool wxImageList::Remove(int index)
} }
return ok; return ok;
#endif
} }
// Remove all images // Remove all images
@@ -269,10 +254,6 @@ bool wxImageList::Draw(int index,
int flags, int flags,
bool solidBackground) bool solidBackground)
{ {
#ifdef __TWIN32__
wxFAIL_MSG(_T("ImageList_Replace not implemented in TWIN32"));
return FALSE;
#else
HDC hDC = GetHdcOf(dc); HDC hDC = GetHdcOf(dc);
wxCHECK_MSG( hDC, FALSE, _T("invalid wxDC in wxImageList::Draw") ); wxCHECK_MSG( hDC, FALSE, _T("invalid wxDC in wxImageList::Draw") );
@@ -305,7 +286,6 @@ bool wxImageList::Draw(int index,
} }
return ok; return ok;
#endif
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

36
src/msw/joystick.cpp
View File

@@ -32,14 +32,12 @@
typedef UINT MMRESULT; typedef UINT MMRESULT;
#endif #endif
#ifndef __TWIN32__
#ifdef __GNUWIN32_OLD__ #ifdef __GNUWIN32_OLD__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#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__)
#define NO_JOYGETPOSEX #define NO_JOYGETPOSEX
#endif #endif
@@ -376,7 +374,7 @@ int wxJoystick::GetNumberButtons() const
int wxJoystick::GetNumberAxes() const int wxJoystick::GetNumberAxes() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -389,7 +387,7 @@ int wxJoystick::GetNumberAxes() const
int wxJoystick::GetMaxButtons() const int wxJoystick::GetMaxButtons() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -402,7 +400,7 @@ int wxJoystick::GetMaxButtons() const
int wxJoystick::GetMaxAxes() const int wxJoystick::GetMaxAxes() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -433,7 +431,7 @@ int wxJoystick::GetPollingMax() const
int wxJoystick::GetRudderMin() const int wxJoystick::GetRudderMin() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -446,7 +444,7 @@ int wxJoystick::GetRudderMin() const
int wxJoystick::GetRudderMax() const int wxJoystick::GetRudderMax() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -459,7 +457,7 @@ int wxJoystick::GetRudderMax() const
int wxJoystick::GetUMin() const int wxJoystick::GetUMin() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -472,7 +470,7 @@ int wxJoystick::GetUMin() const
int wxJoystick::GetUMax() const int wxJoystick::GetUMax() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -485,7 +483,7 @@ int wxJoystick::GetUMax() const
int wxJoystick::GetVMin() const int wxJoystick::GetVMin() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -498,7 +496,7 @@ int wxJoystick::GetVMin() const
int wxJoystick::GetVMax() const int wxJoystick::GetVMax() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0; return 0;
@@ -512,7 +510,7 @@ int wxJoystick::GetVMax() const
bool wxJoystick::HasRudder() const bool wxJoystick::HasRudder() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE; return FALSE;
@@ -525,7 +523,7 @@ bool wxJoystick::HasRudder() const
bool wxJoystick::HasZ() const bool wxJoystick::HasZ() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE; return FALSE;
@@ -538,7 +536,7 @@ bool wxJoystick::HasZ() const
bool wxJoystick::HasU() const bool wxJoystick::HasU() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE; return FALSE;
@@ -551,7 +549,7 @@ bool wxJoystick::HasU() const
bool wxJoystick::HasV() const bool wxJoystick::HasV() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE; return FALSE;
@@ -564,7 +562,7 @@ bool wxJoystick::HasV() const
bool wxJoystick::HasPOV() const bool wxJoystick::HasPOV() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE; return FALSE;
@@ -577,7 +575,7 @@ bool wxJoystick::HasPOV() const
bool wxJoystick::HasPOV4Dir() const bool wxJoystick::HasPOV4Dir() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE; return FALSE;
@@ -590,7 +588,7 @@ bool wxJoystick::HasPOV4Dir() const
bool wxJoystick::HasPOVCTS() const bool wxJoystick::HasPOVCTS() const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE; return FALSE;

4
src/msw/listbox.cpp
View File

@@ -43,10 +43,8 @@
#include "wx/ownerdrw.h" #include "wx/ownerdrw.h"
#endif #endif
#ifndef __TWIN32__ #ifdef __GNUWIN32_OLD__
#ifdef __GNUWIN32_OLD__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif
#endif #endif
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

2
src/msw/listctrl.cpp
View File

@@ -45,7 +45,7 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if ((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#else #else
#include <commctrl.h> #include <commctrl.h>

2
src/msw/main.cpp
View File

@@ -72,7 +72,7 @@ HINSTANCE wxhInstance = 0;
#if !defined(_WINDLL) #if !defined(_WINDLL)
#if defined(__TWIN32__) || defined(__WXMICROWIN__) #if defined(__WXMICROWIN__)
#define HINSTANCE HANDLE #define HINSTANCE HANDLE
extern "C" extern "C"

4
src/msw/minifram.cpp
View File

@@ -45,10 +45,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
#include "wx/minifram.h" #include "wx/minifram.h"
#ifndef __TWIN32__ #ifdef __GNUWIN32_OLD__
#ifdef __GNUWIN32_OLD__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif
#endif #endif
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)

4
src/msw/nativdlg.cpp
View File

@@ -34,7 +34,7 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#if defined(__WIN95__) && !defined(__TWIN32__) #if defined(__WIN95__)
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#endif #endif
#include "wx/msw/private.h" #include "wx/msw/private.h"
@@ -239,7 +239,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
{ {
win = new wxScrollBar; win = new wxScrollBar;
} }
#if defined(__WIN95__) && !defined(__TWIN32__) && wxUSE_SPINBTN #if defined(__WIN95__) && wxUSE_SPINBTN
else if (str == wxT("MSCTLS_UPDOWN32")) else if (str == wxT("MSCTLS_UPDOWN32"))
{ {
win = new wxSpinButton; win = new wxSpinButton;

6
src/msw/notebook.cpp
View File

@@ -42,13 +42,11 @@
#include <windowsx.h> // for SetWindowFont #include <windowsx.h> // for SetWindowFont
#ifndef __TWIN32__ #ifdef __GNUWIN32_OLD__
#ifdef __GNUWIN32_OLD__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif
#endif #endif
#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/ownerdrw.cpp
View File

@@ -225,7 +225,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
// Win32 GDI functions and not wxWindows ones. Might help to whoever decides to // Win32 GDI functions and not wxWindows ones. Might help to whoever decides to
// port this code to X. (VZ) // port this code to X. (VZ)
#if defined(__WIN32__) && !defined(__SYMANTEC__) && !defined(__TWIN32__) #if defined(__WIN32__) && !defined(__SYMANTEC__)
#define O_DRAW_NATIVE_API // comments below explain why I use it #define O_DRAW_NATIVE_API // comments below explain why I use it
#endif #endif

25
src/msw/registry.cpp
View File

@@ -313,7 +313,7 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
size_t *pnValues, size_t *pnValues,
size_t *pnMaxValueLen) const size_t *pnMaxValueLen) const
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
// old gcc headers incorrectly prototype RegQueryInfoKey() // old gcc headers incorrectly prototype RegQueryInfoKey()
#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__) #if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
@@ -680,14 +680,14 @@ bool wxRegKey::DeleteValue(const wxChar *szValue)
if ( !Open() ) if ( !Open() )
return FALSE; return FALSE;
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST szValue); m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST szValue);
if ( m_dwLastError != ERROR_SUCCESS ) { if ( m_dwLastError != ERROR_SUCCESS ) {
wxLogSysError(m_dwLastError, _("Can't delete value '%s' from key '%s'"), wxLogSysError(m_dwLastError, _("Can't delete value '%s' from key '%s'"),
szValue, GetName().c_str()); szValue, GetName().c_str());
return FALSE; return FALSE;
} }
#else //WIN16 #else //WIN16
// named registry values don't exist in Win16 world // named registry values don't exist in Win16 world
wxASSERT( IsEmpty(szValue) ); wxASSERT( IsEmpty(szValue) );
@@ -698,7 +698,7 @@ bool wxRegKey::DeleteValue(const wxChar *szValue)
GetName().c_str()); GetName().c_str());
return FALSE; return FALSE;
} }
#endif //WIN16/32 #endif //WIN16/32
return TRUE; return TRUE;
} }
@@ -788,10 +788,6 @@ wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const
#ifdef __WIN32__ #ifdef __WIN32__
bool wxRegKey::SetValue(const wxChar *szValue, long lValue) bool wxRegKey::SetValue(const wxChar *szValue, long lValue)
{ {
#ifdef __TWIN32__
wxFAIL_MSG("RegSetValueEx not implemented by TWIN32");
return FALSE;
#else
if ( CONST_CAST Open() ) { if ( CONST_CAST Open() ) {
m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_DWORD, m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_DWORD,
(RegString)&lValue, sizeof(lValue)); (RegString)&lValue, sizeof(lValue));
@@ -802,7 +798,6 @@ bool wxRegKey::SetValue(const wxChar *szValue, long lValue)
wxLogSysError(m_dwLastError, _("Can't set value of '%s'"), wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),
GetFullName(this, szValue)); GetFullName(this, szValue));
return FALSE; return FALSE;
#endif
} }
bool wxRegKey::QueryValue(const wxChar *szValue, long *plValue) const bool wxRegKey::QueryValue(const wxChar *szValue, long *plValue) const
@@ -909,20 +904,20 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue) bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue)
{ {
if ( CONST_CAST Open() ) { if ( CONST_CAST Open() ) {
#if defined( __WIN32__) && !defined(__TWIN32__) #if defined( __WIN32__)
m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_SZ, m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_SZ,
(RegString)strValue.c_str(), (RegString)strValue.c_str(),
(strValue.Len() + 1)*sizeof(wxChar)); (strValue.Len() + 1)*sizeof(wxChar));
if ( m_dwLastError == ERROR_SUCCESS ) if ( m_dwLastError == ERROR_SUCCESS )
return TRUE; return TRUE;
#else //WIN16 #else //WIN16
// named registry values don't exist in Win16 // named registry values don't exist in Win16
wxASSERT( IsEmpty(szValue) ); wxASSERT( IsEmpty(szValue) );
m_dwLastError = RegSetValue((HKEY) m_hKey, NULL, REG_SZ, strValue, NULL); m_dwLastError = RegSetValue((HKEY) m_hKey, NULL, REG_SZ, strValue, NULL);
if ( m_dwLastError == ERROR_SUCCESS ) if ( m_dwLastError == ERROR_SUCCESS )
return TRUE; return TRUE;
#endif //WIN16/32 #endif //WIN16/32
} }
wxLogSysError(m_dwLastError, _("Can't set value of '%s'"), wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),
@@ -960,7 +955,7 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
if ( lIndex == -1 ) if ( lIndex == -1 )
return FALSE; return FALSE;
#if defined( __WIN32__) && !defined(__TWIN32__) #if defined( __WIN32__)
wxChar szValueName[1024]; // @@ use RegQueryInfoKey... wxChar szValueName[1024]; // @@ use RegQueryInfoKey...
DWORD dwValueLen = WXSIZEOF(szValueName); DWORD dwValueLen = WXSIZEOF(szValueName);
@@ -985,13 +980,13 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
} }
strValueName = szValueName; strValueName = szValueName;
#else //WIN16 #else //WIN16
// only one unnamed value // only one unnamed value
wxASSERT( lIndex == 0 ); wxASSERT( lIndex == 0 );
lIndex = -1; lIndex = -1;
strValueName.Empty(); strValueName.Empty();
#endif #endif
return TRUE; return TRUE;
} }

2
src/msw/slider95.cpp
View File

@@ -33,7 +33,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_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif

6
src/msw/spinbutt.cpp
View File

@@ -39,13 +39,11 @@
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
// Can't resolve reference to CreateUpDownControl in #if defined(__WIN95__)
// TWIN32, but could probably use normal CreateWindow instead.
#if defined(__WIN95__) && !defined(__TWIN32__)
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/spinctrl.cpp
View File

@@ -40,7 +40,7 @@
#include "wx/spinctrl.h" #include "wx/spinctrl.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#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(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/tabctrl.cpp
View File

@@ -32,7 +32,7 @@
#include <windows.h> #include <windows.h>
#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#else #else
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"

6
src/msw/taskbar.cpp
View File

@@ -29,7 +29,7 @@
#include "wx/menu.h" #include "wx/menu.h"
#endif #endif
#if defined(__WIN95__) && !defined(__TWIN32__) #if defined(__WIN95__)
#include <windows.h> #include <windows.h>
@@ -39,10 +39,8 @@
#include "wx/taskbar.h" #include "wx/taskbar.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#ifndef __TWIN32__ #ifdef __GNUWIN32_OLD__
#ifdef __GNUWIN32_OLD__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif
#endif #endif
#ifdef __SALFORDC__ #ifdef __SALFORDC__

6
src/msw/tbar95.cpp
View File

@@ -49,16 +49,12 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#ifndef __TWIN32__ #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#else #else
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#endif // __TWIN32__
#include "wx/app.h" // for GetComCtl32Version #include "wx/app.h" // for GetComCtl32Version
#if defined(__MWERKS__) && defined(__WXMSW__) #if defined(__MWERKS__) && defined(__WXMSW__)

2
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_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif

2
src/msw/treectrl.cpp
View File

@@ -59,7 +59,7 @@
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif #endif
#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h> #include <commctrl.h>
#endif #endif

12
src/msw/utils.cpp
View File

@@ -56,7 +56,7 @@
#endif #endif
#endif //GNUWIN32 #endif //GNUWIN32
#if defined(__CYGWIN__) && !defined(__TWIN32__) #if defined(__CYGWIN__)
#include <sys/unistd.h> #include <sys/unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/cygwin.h> // for cygwin_conv_to_full_win32_path() #include <sys/cygwin.h> // for cygwin_conv_to_full_win32_path()
@@ -147,7 +147,7 @@ static const wxChar eUSERID[] = wxT("UserId");
// Get hostname only (without domain name) // Get hostname only (without domain name)
bool wxGetHostName(wxChar *buf, int maxSize) bool wxGetHostName(wxChar *buf, int maxSize)
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && !defined(__WXMICROWIN__)
DWORD nSize = maxSize; DWORD nSize = maxSize;
if ( !::GetComputerName(buf, &nSize) ) if ( !::GetComputerName(buf, &nSize) )
{ {
@@ -173,7 +173,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
// get full hostname (with domain name if possible) // get full hostname (with domain name if possible)
bool wxGetFullHostName(wxChar *buf, int maxSize) bool wxGetFullHostName(wxChar *buf, int maxSize)
{ {
#if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__)) #if defined(__WIN32__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
// TODO should use GetComputerNameEx() when available // TODO should use GetComputerNameEx() when available
// the idea is that if someone had set wxUSE_SOCKETS to 0 the code // the idea is that if someone had set wxUSE_SOCKETS to 0 the code
@@ -227,7 +227,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
// Get user ID e.g. jacs // Get user ID e.g. jacs
bool wxGetUserId(wxChar *buf, int maxSize) bool wxGetUserId(wxChar *buf, int maxSize)
{ {
#if defined(__WIN32__) && !defined(__win32s__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && !defined(__win32s__) && !defined(__WXMICROWIN__)
DWORD nSize = maxSize; DWORD nSize = maxSize;
if ( ::GetUserName(buf, &nSize) == 0 ) if ( ::GetUserName(buf, &nSize) == 0 )
{ {
@@ -366,7 +366,7 @@ const wxChar* wxGetHomeDir(wxString *pstr)
{ {
wxString& strDir = *pstr; wxString& strDir = *pstr;
#if defined(__UNIX__) && !defined(__TWIN32__) #if defined(__UNIX__)
const wxChar *szHome = wxGetenv("HOME"); const wxChar *szHome = wxGetenv("HOME");
if ( szHome == NULL ) { if ( szHome == NULL ) {
// we're homeless... // we're homeless...
@@ -934,7 +934,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory() long wxGetFreeMemory()
{ {
#if defined(__WIN32__) && !defined(__BORLANDC__) && !defined(__TWIN32__) #if defined(__WIN32__) && !defined(__BORLANDC__)
MEMORYSTATUS memStatus; MEMORYSTATUS memStatus;
memStatus.dwLength = sizeof(MEMORYSTATUS); memStatus.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&memStatus); GlobalMemoryStatus(&memStatus);

4
src/msw/utilsexc.cpp
View File

@@ -54,7 +54,7 @@
#endif #endif
#endif #endif
#if defined(__GNUWIN32__) && !defined(__TWIN32__) #if defined(__GNUWIN32__)
#include <sys/unistd.h> #include <sys/unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
@@ -594,7 +594,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
command = cmd; command = cmd;
} }
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
// the IO redirection is only supported with wxUSE_STREAMS // the IO redirection is only supported with wxUSE_STREAMS
BOOL redirect = FALSE; BOOL redirect = FALSE;

2
src/msw/wave.cpp
View File

@@ -70,7 +70,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
m_isResource = TRUE; m_isResource = TRUE;
HRSRC hresInfo; HRSRC hresInfo;
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
#ifdef _UNICODE #ifdef _UNICODE
hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, wxT("WAVE")); hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, wxT("WAVE"));
#else #else

6
src/msw/window.cpp
View File

@@ -104,14 +104,12 @@
#include <windowsx.h> #include <windowsx.h>
#endif #endif
#if (!defined(__GNUWIN32_OLD__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__)) || defined(__CYGWIN10__) #if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__)) || defined(__CYGWIN10__)
#ifdef __WIN95__ #ifdef __WIN95__
#include <commctrl.h> #include <commctrl.h>
#endif #endif
#elif !defined(__WXMICROWIN__) // broken compiler #elif !defined(__WXMICROWIN__) // broken compiler
#ifndef __TWIN32__
#include "wx/msw/gnuwin32/extra.h" #include "wx/msw/gnuwin32/extra.h"
#endif
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -4824,7 +4822,7 @@ void wxSetKeyboardHook(bool doIt)
wxTheKeyboardHookProc = MakeProcInstance((FARPROC) wxKeyboardHook, wxGetInstance()); wxTheKeyboardHookProc = MakeProcInstance((FARPROC) wxKeyboardHook, wxGetInstance());
wxTheKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC) wxTheKeyboardHookProc, wxGetInstance(), wxTheKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC) wxTheKeyboardHookProc, wxGetInstance(),
#if defined(__WIN32__) && !defined(__TWIN32__) #if defined(__WIN32__)
GetCurrentThreadId() GetCurrentThreadId()
// (DWORD)GetCurrentProcess()); // This is another possibility. Which is right? // (DWORD)GetCurrentProcess()); // This is another possibility. Which is right?
#else #else