Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h
index 77dffb489968283f097ec23345d3cbd8aaf2a728..4f82696b8d5743f43647e075f5e89cb005d1cbb6 100644 (file)
--- a/include/wx/palmos/accel.h
+++ b/include/wx/palmos/accel.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/accel.h
 // Purpose:     wxAcceleratorTable class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/accel.h
 // Purpose:     wxAcceleratorTable class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,23 +12,16 @@
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "accel.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxAcceleratorTable : public wxObject
+class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject

 {
 public:
     // default ctor
     wxAcceleratorTable();
 
 {
 public:
     // default ctor
     wxAcceleratorTable();
 

-    // copy ctor
-    wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
-

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


@@ -37,17 +30,12 @@ public:
 
     virtual ~wxAcceleratorTable();
 
 
     virtual ~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; } // FIXME: this is wrong (VZ)
-    bool operator!=(const wxAcceleratorTable& accel) const
-        { return !(*this == accel); }
-
-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     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: