Fix to FIXME: better nothing than broken comparison.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -38,10 +38,13 @@ public:
 | 
			
		||||
    virtual ~wxAcceleratorTable();
 | 
			
		||||
 | 
			
		||||
    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; }
 | 
			
		||||
 | 
			
		||||
#if WXWIN_COMPATIBILITY_2_4
 | 
			
		||||
    bool operator==(const wxAcceleratorTable& accel) const
 | 
			
		||||
        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
 | 
			
		||||
        { return m_refData == accel.m_refData; }
 | 
			
		||||
    bool operator!=(const wxAcceleratorTable& accel) const
 | 
			
		||||
        { return !(*this == accel); }
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    bool Ok() const;
 | 
			
		||||
    void SetHACCEL(WXHACCEL hAccel);
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
// Author:      William Osborne
 | 
			
		||||
// Modified by:
 | 
			
		||||
// Created:     10/13/04
 | 
			
		||||
// RCS-ID:      $Id: 
 | 
			
		||||
// RCS-ID:      $Id:
 | 
			
		||||
// Copyright:   (c) William Osborne
 | 
			
		||||
// Licence:     wxWindows licence
 | 
			
		||||
/////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
@@ -38,16 +38,19 @@ public:
 | 
			
		||||
    virtual ~wxAcceleratorTable();
 | 
			
		||||
 | 
			
		||||
    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; }
 | 
			
		||||
 | 
			
		||||
#if WXWIN_COMPATIBILITY_2_4
 | 
			
		||||
    bool operator==(const wxAcceleratorTable& accel) const
 | 
			
		||||
        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
 | 
			
		||||
        { return m_refData == accel.m_refData; }
 | 
			
		||||
    bool operator!=(const wxAcceleratorTable& accel) const
 | 
			
		||||
        { return !(*this == accel); }
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    bool Ok() const;
 | 
			
		||||
    void SetHACCEL(WXHACCEL hAccel);
 | 
			
		||||
    WXHACCEL GetHACCEL() const;
 | 
			
		||||
 | 
			
		||||
    // translate the accelerator, return TRUE if done
 | 
			
		||||
    // translate the accelerator, return true if done
 | 
			
		||||
    bool Translate(wxWindow *window, WXMSG *msg) const;
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user