*** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1384,8 +1384,8 @@ typedef enum {
|
|||||||
// platform specific (implementation) parts of the headers
|
// platform specific (implementation) parts of the headers
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#if defined(__WXMSW__) || defined(__WXPM__)
|
||||||
// Stand-ins for Windows types, to avoid #including all of windows.h
|
// Stand-ins for Windows types or OS/2, to avoid #including all of windows.h or os2.h
|
||||||
typedef unsigned long WXHWND;
|
typedef unsigned long WXHWND;
|
||||||
typedef unsigned long WXHANDLE;
|
typedef unsigned long WXHANDLE;
|
||||||
typedef unsigned long WXHICON;
|
typedef unsigned long WXHICON;
|
||||||
|
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
#ifndef NO_TEXT_WINDOW_STREAM
|
#ifndef NO_TEXT_WINDOW_STREAM
|
||||||
#if wxUSE_STD_IOSTREAM
|
#if wxUSE_STD_IOSTREAM
|
||||||
#include "ioswrap.h" // for iostream classes if we need them
|
#include "wx/ioswrap.h" // for iostream classes if we need them
|
||||||
#else // !wxUSE_STD_IOSTREAM
|
#else // !wxUSE_STD_IOSTREAM
|
||||||
// can't compile this feature in if we don't use streams at all
|
// can't compile this feature in if we don't use streams at all
|
||||||
#define NO_TEXT_WINDOW_STREAM
|
#define NO_TEXT_WINDOW_STREAM
|
||||||
|
@@ -134,7 +134,7 @@ private:
|
|||||||
|
|
||||||
// in order to avoid any overhead under !MSW make all wxCriticalSection class
|
// in order to avoid any overhead under !MSW make all wxCriticalSection class
|
||||||
// functions inline - but this can't be done under MSW
|
// functions inline - but this can't be done under MSW
|
||||||
#ifdef __WXMSW__
|
#if defined(__WXMSW__) || defined(__WXPM__)
|
||||||
class WXDLLEXPORT wxCriticalSectionInternal;
|
class WXDLLEXPORT wxCriticalSectionInternal;
|
||||||
#define WXCRITICAL_INLINE
|
#define WXCRITICAL_INLINE
|
||||||
#else // !MSW
|
#else // !MSW
|
||||||
|
Reference in New Issue
Block a user