[ 1522987 ] wxComboCtrl crashes if TAB is pressed while popup is open

[wxWidgets.git] / include / wx / motif / dataobj2.h

diff --git a/include/wx/motif/dataobj2.h b/include/wx/motif/dataobj2.h
index 8e7fad45ddb005761160a4208f68d8436011cde0..cb0db270d78b10ec2a0dbfbaaddd9bd2073fe4b5 100644 (file)
--- a/include/wx/motif/dataobj2.h
+++ b/include/wx/motif/dataobj2.h
@@ -11,10 +11,6 @@
 #ifndef _WX_MOTIF_DATAOBJ2_H_
 #define _WX_MOTIF_DATAOBJ2_H_
 
 #ifndef _WX_MOTIF_DATAOBJ2_H_
 #define _WX_MOTIF_DATAOBJ2_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dataobj.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
 // ----------------------------------------------------------------------------


@@ -33,6 +29,16 @@ public:
     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);
     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);

+
+    // unhide base class virtual functions
+    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
+        { return GetDataSize(); }
+    virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
+                             void *buf) const
+        { return GetDataHere(buf); }
+    virtual bool SetData(const wxDataFormat& WXUNUSED(format),
+                         size_t len, const void *buf)
+        { return SetData(len, buf); }

 };
 
 #endif // _WX_MOTIF_DATAOBJ2_H_
 };
 
 #endif // _WX_MOTIF_DATAOBJ2_H_