updated master files

Author: SatyaRanjanDas-tomtom

test/e2e/test_master/ObjectArxHeaders/accmd.h

@@ -45,13 +45,12 @@ struct AcEdCommandStruc
   AcEdCommand* cmd;
 };
 #  pragma  pack (pop)
-#  if  defined(__cplusplus)
-#    include "dbmain.h"
-#    include "rxobject.h"
+#  include "dbmain.h"
+#  include "rxobject.h"
 class AcRxDictionary;
 class AcEdUIContext;
 class AcEdCommandReactor;
-#    pragma  pack (push, 8)
+#  pragma  pack (push, 8)
 class AcEdCommand : public AcRxObject
 {
 public:
@@ -126,7 +125,7 @@ class AcEdCommandIterator : public AcRxObject
   virtual const AcEdCommand* command() const = 0;
   virtual const ACHAR* commandGroup() const = 0;
 };
-#    define acedRegCmds	AcEdCommandStack::cast(acrxSysRegistry()->at(ACRX_COMMAND_DOCK))
+#  define acedRegCmds	AcEdCommandStack::cast(acrxSysRegistry()->at(ACRX_COMMAND_DOCK))
 class AcEdCommandStack : public AcRxObject
 {
 public:
@@ -146,6 +145,5 @@ class AcEdCommandStack : public AcRxObject
   void addReactor(AcEdCommandStackReactor* pReactor);
   void removeReactor(AcEdCommandStackReactor* pReactor);
 };
-#    pragma  pack (pop)
-#  endif
+#  pragma  pack (pop)
 #endif

test/e2e/test_master/ObjectArxHeaders/dbjig.h

@@ -16,10 +16,9 @@
 //  
 #ifndef _DBJIG_H_
 #  define _DBJIG_H_	1
-#  if  defined(__cplusplus)
-#    include "AcCoreDefs.h"
-#    include "dbdimdata.h"
-#    pragma  pack (push, 8)
+#  include "AcCoreDefs.h"
+#  include "dbdimdata.h"
+#  pragma  pack (push, 8)
 class AcEdImpJig;
 class AcDbEntity;
 class AcEdImpDragStyle;
@@ -182,6 +181,5 @@ class ACCORE_PORT AcEdDragStyle
   AcEdImpDragStyle* mpDraggedDragStyle;
   friend class AcEdImpDragStyle;
 };
-#    pragma  pack (pop)
-#  endif
+#  pragma  pack (pop)
 #endif

test/e2e/test_master/wxWidgets/include/wx/android/setup.h

@@ -666,7 +666,11 @@
 // Default is 1 on MSW
 //
 // Recommended setting: 1
-#  define wxUSE_WEBVIEW_IE	0
+#  ifdef __WXMSW__
+#    define wxUSE_WEBVIEW_IE	1
+#  else 
+#    define wxUSE_WEBVIEW_IE	0
+#  endif
 // Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK)
 //
 // Default is 0 because WebView2 is not always available, set it to 1 if you do have it.
@@ -1075,7 +1079,11 @@
 // long-running programs can run into problems with ids reuse without this. On
 // the other platforms, where the ids have the full int range, this shouldn't
 // be necessary.
-#  define wxUSE_AUTOID_MANAGEMENT	0
+#  ifdef __WXMSW__
+#    define wxUSE_AUTOID_MANAGEMENT	1
+#  else 
+#    define wxUSE_AUTOID_MANAGEMENT	0
+#  endif
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------
@@ -1261,7 +1269,11 @@
 // Default is 1 on MSW, 0 elsewhere.
 //
 // Recommended setting (at present): 1 (MSW-only)
-#  define wxUSE_ACCESSIBILITY	0
+#  ifdef __WXMSW__
+#    define wxUSE_ACCESSIBILITY	1
+#  else 
+#    define wxUSE_ACCESSIBILITY	0
+#  endif
 // ----------------------------------------------------------------------------
 // miscellaneous settings
 // ----------------------------------------------------------------------------

test/e2e/test_master/wxWidgets/include/wx/chartype.h

@@ -117,6 +117,9 @@ typedef wchar_t wxUChar;
 #  ifndef wxUSE_UTF8_LOCALE_ONLY
 #    define wxUSE_UTF8_LOCALE_ONLY	0
 #  endif
+#  ifndef wxUSE_UNICODE_UTF8
+#    define wxUSE_UNICODE_UTF8	0
+#  endif
 #  if  wxUSE_UNICODE_UTF8
 #    define wxUSE_UNICODE_WCHAR	0
 #    define wxUSE_UNICODE_WCHAR	1

test/e2e/test_master/wxWidgets/include/wx/chkconf.h

@@ -241,6 +241,12 @@
 #      define wxUSE_XML	0
 #    endif
 #  endif
+#  ifndef wxUSE_STD_CONTAINERS_COMPATIBLY
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#    else 
+#      define wxUSE_STD_CONTAINERS_COMPATIBLY	0
+#    endif
+#  endif
 #  ifndef wxUSE_STD_STRING_CONV_IN_WXSTRING
 #    ifdef wxABORT_ON_CONFIG_ERROR
 #    else 
@@ -1434,8 +1440,10 @@
         define it in wx/setup_inc.h so don't complain if it happens to be
         defined under another platform but just silently fix it.
      */
-#      undef wxUSE_MS_HTML_HELP
-#      define wxUSE_MS_HTML_HELP	0
+#      ifndef __WXMSW__
+#        undef wxUSE_MS_HTML_HELP
+#        define wxUSE_MS_HTML_HELP	0
+#      endif
 #    endif
 #    if  wxUSE_WXHTML_HELP
 #      if  !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL

test/e2e/test_master/wxWidgets/include/wx/containr.h

@@ -81,12 +81,15 @@ class WXDLLIMPEXP_CORE wxControlContainerBase
     //
     // Returns true if we have any focusable children, false otherwise.
   bool UpdateCanFocusChildren();
+#  ifdef __WXMSW__
     // This is not strictly related to navigation, but all windows containing
     // more than one children controls need to return from this method if any
     // of their parents has an inheritable background, so do this automatically
     // for all of them (another alternative could be to do it in wxWindow
     // itself but this would be potentially more backwards incompatible and
     // could conceivably break some custom windows).
+  bool HasTransparentBackground() const;
+#  endif
 protected:
     // set the focus to the child which had it the last time
   virtual bool SetFocusToChild();
@@ -216,6 +219,16 @@ class wxNavigationEnabled : public W
   {
     BaseWindowClass::SetFocus();
   }
+#  ifdef __WXMSW__
+  WXDLLIMPEXP_INLINE_CORE bool HasTransparentBackground() override
+  {
+    return m_container.HasTransparentBackground();
+  }
+  WXDLLIMPEXP_INLINE_CORE void WXSetPendingFocus(wxWindow* win) override
+  {
+    return m_container.SetLastFocus(win);
+  }
+#  endif
 #  ifndef wxHAS_NATIVE_TAB_TRAVERSAL
 protected:
   void OnNavigationKey(wxNavigationKeyEvent& event)

test/e2e/test_master/wxWidgets/include/wx/cursor.h

@@ -13,7 +13,11 @@
 #  include "wx/gdicmn.h"
 // Under most ports, wxCursor derives directly from wxGDIObject, but in wxMSW
 // there is an intermediate wxGDIImage class.
+#  ifdef __WXMSW__
+#    include "wx/msw/gdiimage.h"
+#  else 
 typedef wxGDIObject wxGDIImage;
+#  endif
 class WXDLLIMPEXP_CORE wxCursorBase : public wxGDIImage
 {
 public:

test/e2e/test_master/wxWidgets/include/wx/dc.h

@@ -544,18 +544,17 @@ class WXDLLIMPEXP_CORE wxDCImpl : public wxObject
   {
     return m_contentScaleFactor;
   }
+#  ifdef __WXMSW__
     // Native Windows functions using the underlying HDC don't honour GDI+
     // transformations which may be applied to it. Using this function we can
     // transform the coordinates manually before passing them to such functions
     // (as in e.g. wxRendererMSW code). It doesn't do anything if this is not a
     // wxGCDC.
-    virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const
-    {
-        return r;
-    }
-#endif // __WXMSW__
-
-
+  virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const
+  {
+    return r;
+  }
+#  endif
     // ---------------------------------------------------------
     // the actual drawing API
   virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, wxFloodFillStyle style = wxFLOOD_SURFACE) = 0;
@@ -1363,62 +1362,57 @@ class WXDLLIMPEXP_CORE wxDC : public wxObject
   }
 #  endif
     // for compatibility with the old code when wxCoord was long everywhere
-    wxDEPRECATED( void GetTextExtent(const wxString& string,
-                       long *x, long *y,
-                       long *descent = NULL,
-                       long *externalLeading = NULL,
-                       const wxFont *theFont = NULL) const );
-    wxDEPRECATED( void GetLogicalOrigin(long *x, long *y) const );
-    wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
-    wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const );
-
-    wxDEPRECATED( void DrawObject(wxDrawObject* drawobject) );
-#endif  // WXWIN_COMPATIBILITY_2_8
-
-#ifdef __WXMSW__
+#  ifdef __WXMSW__
     // GetHDC() is the simplest way to retrieve an HDC From a wxDC but only
     // works if this wxDC is GDI-based and fails for GDI+ contexts (and
     // anything else without HDC, e.g. wxPostScriptDC)
-    WXHDC GetHDC() const;
-
+  WXHDC GetHDC() const;
     // don't use these methods manually, use GetTempHDC() instead
-    virtual WXHDC AcquireHDC() { return GetHDC(); }
-    virtual void ReleaseHDC(WXHDC WXUNUSED(hdc)) { }
-
+  virtual WXHDC AcquireHDC()
+  {
+    return GetHDC();
+  }
+  virtual void ReleaseHDC(WXHDC)
+  {
+  }
     // helper class holding the result of GetTempHDC() with std::auto_ptr<>-like
     // semantics, i.e. it is moved when copied
-    class TempHDC
+  class TempHDC
+  {
+  public:
+    TempHDC(wxDC& dc)
+      : m_dc(dc)
+      , m_hdc(dc.AcquireHDC())
     {
-    public:
-        TempHDC(wxDC& dc)
-            : m_dc(dc),
-              m_hdc(dc.AcquireHDC())
-        {
-        }
-
-        TempHDC(const TempHDC& thdc)
-            : m_dc(thdc.m_dc),
-              m_hdc(thdc.m_hdc)
-        {
-            const_cast<TempHDC&>(thdc).m_hdc = NULL;
-        }
-
-        ~TempHDC()
-        {
-            if ( m_hdc )
-                m_dc.ReleaseHDC(m_hdc);
-        }
-
-        WXHDC GetHDC() const { return m_hdc; }
-
-    private:
-        wxDC& m_dc;
-        WXHDC m_hdc;
-
-        wxDECLARE_NO_ASSIGN_CLASS(TempHDC);
-    };
-
+    }
+    TempHDC(const TempHDC& thdc)
+      : m_dc(thdc.m_dc)
+      , m_hdc(thdc.m_hdc)
+    {
+      const_cast<TempHDC&>(thdc).m_hdc = NULL;
+    }
+    ~TempHDC()
+    {
+      if (m_hdc)
+      {
+        m_dc.ReleaseHDC(m_hdc);
+      }
+    }
+    WXHDC GetHDC() const
+    {
+      return m_hdc;
+    }
+  private:
+    wxDC& m_dc;
+    WXHDC m_hdc;
+    wxDECLARE_NO_ASSIGN_CLASS(TempHDC);
+  };
     // GetTempHDC() also works for wxGCDC (but still not for wxPostScriptDC &c)
+  TempHDC GetTempHDC()
+  {
+    return TempHDC(*this);
+  }
+#  endif
 #  if  wxUSE_GRAPHICS_CONTEXT
   virtual wxGraphicsContext* GetGraphicsContext() const
   {

test/e2e/test_master/wxWidgets/include/wx/dcgraph.h

@@ -28,8 +28,12 @@ class WXDLLIMPEXP_CORE wxGCDC : public wxDC
   wxGCDC(wxGraphicsContext* context);
   wxGCDC();
   virtual ~wxGCDC();
+#    ifdef __WXMSW__
     // override wxDC virtual functions to provide access to HDC associated with
     // this Graphics object (implemented in src/msw/graphics.cpp)
+  WXHDC AcquireHDC() override;
+  void ReleaseHDC(WXHDC hdc) override;
+#    endif
 private:
   wxDECLARE_DYNAMIC_CLASS(wxGCDC);
   wxDECLARE_NO_COPY_CLASS(wxGCDC);
@@ -127,6 +131,9 @@ class WXDLLIMPEXP_CORE wxGCDCImpl : public wxDCImpl
   bool DoGetClippingRect(wxRect& rect) const override;
   void DoGetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* theFont = NULL) const override;
   bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const override;
+#    ifdef __WXMSW__
+  wxRect MSWApplyGDIPlusTransform(const wxRect& r) const override;
+#    endif
     // update the internal clip box variables
   void UpdateClipBox();
 protected:

test/e2e/test_master/wxWidgets/include/wx/defs.h

@@ -2378,14 +2378,8 @@ old C struct with the same name.  Unfortunately, because the compiler
 does not see a struct as an Objective-C class we cannot declare it
 as a struct in Objective-C(++) mode.
 */
-#      if  defined(__OBJC__)
-#        define DECLARE_WXCOCOA_OBJC_CLASS(klass)	 \
-@class klass; \
-typedef klass *WX_##klass
-#      else 
-#        define DECLARE_WXCOCOA_OBJC_CLASS(klass)	 \
+#      define DECLARE_WXCOCOA_OBJC_CLASS(klass)	 \
 typedef struct klass *WX_##klass
-#      endif
 #    else 
 /*  NOTE: typedef struct objc_object *id; */
 /*  IOW, we're declaring these using the id type without using that name, */
@@ -2516,6 +2510,9 @@ typedef void* WXHTREEITEM;
 typedef void* WXDRAWITEMSTRUCT;
 typedef void* WXMEASUREITEMSTRUCT;
 typedef void* WXLPCREATESTRUCT;
+#    ifdef __WXMSW__
+typedef WXHWND WXWidget;
+#    endif
 #    ifdef __WIN64__
 typedef wxUint64 WXWPARAM;
 typedef wxInt64 WXLPARAM;