Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / os2 / accel.h

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index a0ee7448b31e80cce869cc0a4295558d4535d8b4..30dde8404a0b2a669dca849aa5c40f72ad7347db 100644 (file)
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        accel.h
+// Name:        wx/os2/accel.h
 // Purpose:     wxAcceleratorTable class
 // Author:      David Webster
 // Modified by:
@@ -14,7 +14,7 @@
 
 #include "wx/object.h"
 
-class WXDLLEXPORT wxAcceleratorTable;
+class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
 
 // Hold Ctrl key down
 #define wxACCEL_ALT     0x01
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxAcceleratorTable;
  // Hold no key down
 #define wxACCEL_NORMAL  0x00
 
-class WXDLLEXPORT wxAcceleratorTable: public wxObject
+class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
@@ -40,11 +40,6 @@ public:
 
     virtual ~wxAcceleratorTable();
 
-    inline bool operator== (const wxAcceleratorTable& rAccel) const
-    { return m_refData == rAccel.m_refData; };
-    inline bool operator!= (const wxAcceleratorTable& rAccel) const
-    { return m_refData != rAccel.m_refData; };
-
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
     void SetHACCEL(WXHACCEL hAccel);
@@ -56,8 +51,8 @@ public:
                   ) const;
 };
 
-WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
-WXDLLEXPORT wxString wxPMTextToLabel(const wxString& rsTitle);
+WXDLLIMPEXP_CORE wxString wxPMTextToLabel(const wxString& rsTitle);
 #endif
     // _WX_ACCEL_H_