From: David Webster <Dave.Webster@bhmi.com>
Date: Thu, 21 Oct 1999 22:36:51 +0000 (+0000)
Subject: VA fussy compiler fix (must qualify any reference to member more than one class up... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4004aba33197f62b09f6c77834d5301def168e61

VA fussy compiler fix (must qualify any reference to member more than one class up the inheritance tree


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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 55fe8a4dc8..76e30d96a6 100644
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -79,6 +79,8 @@ public:
     #include "wx/motif/dataform.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataform.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/dataform.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -208,12 +210,12 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
-    virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir) = Get) const
+    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
         { return m_format; }
-    virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const
+    virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
         { return 1; }
     virtual void GetAllFormats(wxDataFormat *formats,
-                               Direction WXUNUSED(dir) = Get) const
+                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
         { *formats = m_format; }
     virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
         { return GetDataSize(); }
@@ -254,9 +256,9 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
-    virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
-    virtual size_t GetFormatCount(Direction dir = Get) const;
-    virtual void GetAllFormats(wxDataFormat *formats, Direction dir = Get) const;
+    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const;
+    virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const;
+    virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const;
     virtual size_t GetDataSize(const wxDataFormat& format) const;
     virtual bool GetDataHere(const wxDataFormat& format, void *buf) const;
     virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf);