Possibly to allow including both os2/private.h and GUI's private.h for

        X11 based builds on OS/2.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index c256c6df8d79412b96c8d9e773ead9664c3f17e0..b97c2bac5c7f3fc70b4b3dc51feeed23e45f700a 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -11,8 +11,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_PRIVATE_H_
-#define _WX_PRIVATE_H_
+#ifndef _WX_OS2_PRIVATE_H_
+#define _WX_OS2_PRIVATE_H_

 
 #define INCL_BASE
 #define INCL_PM
 
 #define INCL_BASE
 #define INCL_PM


@@ -20,9 +20,7 @@
 #define INCL_WINSYS
 #define INCL_SHLERRORS
 #include <os2.h>
 #define INCL_WINSYS
 #define INCL_SHLERRORS
 #include <os2.h>

-#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(FCF_CLOSEBUTTON)
-/* struct missing in "os2emx.h" - luckily FCF_CLOSEBUTTON was added in the
-   same version of os2emx.h as SPBCDATA type, so we can do the test above. */
+#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(HAVE_SPBCDATA)

  typedef struct _SPBCDATA {
    ULONG     cbSize;       /*  Size of control block. */
    ULONG     ulTextLimit;  /*  Entryfield text limit. */
  typedef struct _SPBCDATA {
    ULONG     cbSize;       /*  Size of control block. */
    ULONG     ulTextLimit;  /*  Entryfield text limit. */