fill in flags parameter of HitTest() for all book controls; added new wxNB_HITTEST_ON...

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

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index f12542fd523b879922b58255c3615bd81c10f24c..60f3de60c066c42f3d5048a0172d5813b91de40f 100644 (file)
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -38,17 +38,11 @@ public:
                        ,const wxAcceleratorEntry vaEntries[]
                       ); // Load from array
 
                        ,const wxAcceleratorEntry vaEntries[]
                       ); // Load from array
 

-    // Copy constructors
-    inline wxAcceleratorTable(const wxAcceleratorTable& rAccel) { Ref(rAccel); }
-    inline wxAcceleratorTable(const wxAcceleratorTable* pAccel) { if (pAccel) Ref(*pAccel); }
-

     ~wxAcceleratorTable();
 
     ~wxAcceleratorTable();
 

-    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& rAccel)
-    { if (*this == rAccel) return (*this); Ref(rAccel); return *this; };
-    inline bool operator == (const wxAcceleratorTable& rAccel)
+    inline bool operator== (const wxAcceleratorTable& rAccel) const

     { return m_refData == rAccel.m_refData; };
     { return m_refData == rAccel.m_refData; };

-    inline bool operator != (const wxAcceleratorTable& rAccel)
+    inline bool operator!= (const wxAcceleratorTable& rAccel) const

     { return m_refData != rAccel.m_refData; };
 
     bool Ok() const;
     { return m_refData != rAccel.m_refData; };
 
     bool Ok() const;


@@ -63,5 +57,6 @@ public:
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 

+WXDLLEXPORT wxString wxPMTextToLabel(const wxString& rsTitle);

 #endif
     // _WX_ACCEL_H_
 #endif
     // _WX_ACCEL_H_