Made wxGTK compile and link again. Broke wxMSW a little.

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

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index d985b652ff5c50e4e225305749b1fda9355316df..d035b0aac4d04b74e29581f8b2a8a3ad222d81e9 100644 (file)
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -76,18 +76,14 @@ public:
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 
     // Copy constructors
-    wxAcceleratorTable(const wxAcceleratorTable& accel)
-        { Ref(accel); }
+    inline wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
+    inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
 
     ~wxAcceleratorTable();
 
-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
-        { if ( *this != accel ) Ref(accel); return *this; }
-
-    bool operator == (const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; }
-    bool operator != (const wxAcceleratorTable& accel) const
-        { return m_refData != accel.m_refData; }
+    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; }
+    inline bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; }
+    inline bool operator != (const wxAcceleratorTable& accel) const { return m_refData != accel.m_refData; }
 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);