X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22e0b22bac4acb88d983c635ad634a5fb1208552..4508c2b01b806be847366f0b3da0f6e65ec23cc5:/include/wx/os2/private.h?ds=inline

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 28b1ed31bf..024663695b 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
 // Purpose:     Private declarations: as this header is only included by
-//              wxWindows itself, it may contain identifiers which don't start
+//              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Author:      Julian Smart
 // Modified by:
@@ -20,8 +20,9 @@
 #define INCL_WINSYS
 #define INCL_SHLERRORS
 #include <os2.h>
-#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS)
-/* struct missing in "os2emx.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. */
  typedef struct _SPBCDATA {
    ULONG     cbSize;       /*  Size of control block. */
    ULONG     ulTextLimit;  /*  Entryfield text limit. */
@@ -34,9 +35,6 @@
  typedef SPBCDATA *PSPBCDATA;
 #endif
 
-#undef WS_VISIBLE
-#define WS_VISIBLE 0
-
 #include "wx/fontenc.h"
 
 class WXDLLEXPORT wxFont;
@@ -48,19 +46,6 @@ class WXDLLEXPORT wxBitmap;
 // private constants
 // ---------------------------------------------------------------------------
 
-// Conversion
-static const double METRIC_CONVERSION_CONSTANT = 0.0393700787;
-
-// Scaling factors for various unit conversions
-static const double mm2inches = (METRIC_CONVERSION_CONSTANT);
-static const double inches2mm = (1/METRIC_CONVERSION_CONSTANT);
-
-static const double mm2twips = (METRIC_CONVERSION_CONSTANT*1440);
-static const double twips2mm = (1/(METRIC_CONVERSION_CONSTANT*1440));
-
-static const double mm2pt = (METRIC_CONVERSION_CONSTANT*72);
-static const double pt2mm = (1/(METRIC_CONVERSION_CONSTANT*72));
-
 //
 // Constant strings for control names and classes
 //
@@ -247,7 +232,7 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
 #define GetHfont()              ((HFONT)GetHFONT())
 #define GetHfontOf(font)        ((HFONT)(font).GetHFONT())
 
-// OS/2 convention of the mask is opposed to the wxWindows one, so we need
+// OS/2 convention of the mask is opposed to the wxWidgets one, so we need
 // to invert the mask each time we pass one/get one to/from Windows
 extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);