wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

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

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index 7d07af2c57a9167db2ae4589605841e4e4b963c9..a2c82dea1e770ae9a960a6f3ca533a664804207a 100644 (file)
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "accel.h"
 #endif
 
     #pragma interface "accel.h"
 #endif
 


@@ -24,10 +24,10 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     // default ctor
 {
 public:
     // default ctor

-    wxAcceleratorTable();
+    wxAcceleratorTable() : wxObject() { }

 
     // copy ctor
 
     // copy ctor

-    wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
+    wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); }

 
     // load from .rc resource (Windows specific)
     wxAcceleratorTable(const wxString& resource);
 
     // load from .rc resource (Windows specific)
     wxAcceleratorTable(const wxString& resource);


@@ -35,11 +35,14 @@ public:
     // initialize from array
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 
     // initialize from array
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 

-    virtual ~wxAcceleratorTable();
+    wxAcceleratorTable& operator=(const wxAcceleratorTable& accel)
+    {
+        if ( *this != accel )
+            Ref(accel);
+        return *this;
+    }

 
 

-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; }
-    bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
+    bool operator==(const wxAcceleratorTable& accel) const;

     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }
 
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }
 


@@ -47,7 +50,7 @@ public:
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() 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:
     bool Translate(wxWindow *window, WXMSG *msg) const;
 
 private: