finished wxWindow for MGL

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

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index 49c4126393e2e4cdffe761f528cff9377771b635..6e33d02ee7bb2cbfd30729ab75c2f0eb008e49c8 100644 (file)
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -1,23 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        accel.h
 // Purpose:     wxAcceleratorTable class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        accel.h
 // Purpose:     wxAcceleratorTable class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 

-#ifdef __GNUG__
-#pragma interface "accel.h"
-#endif
-

 #include "wx/object.h"
 #include "wx/object.h"

-#include "wx/string.h"

 
 class WXDLLEXPORT wxAcceleratorTable;
 
 
 class WXDLLEXPORT wxAcceleratorTable;
 


@@ -33,53 +28,37 @@ class WXDLLEXPORT wxAcceleratorTable;
  // Hold no key down
 #define wxACCEL_NORMAL  0x00
 
  // Hold no key down
 #define wxACCEL_NORMAL  0x00
 

-class WXDLLEXPORT wxAcceleratorEntry
-{
-public:
-    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
-    {
-        m_flags = flags; m_keyCode = keyCode; m_command = cmd;
-    }
-
-    inline void Set(int flags, int keyCode, int cmd)
-         { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
-
-    inline int GetFlags() const { return m_flags; }
-    inline int GetKeyCode() const { return m_keyCode; }
-    inline int GetCommand() const { return m_command; }
-
-    int             m_flags;
-    int                            m_keyCode; // ASCII or virtual keycode
-    int                            m_command; // Command id to generate
-};
-

 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
     wxAcceleratorTable();
 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
     wxAcceleratorTable();

-    wxAcceleratorTable(const wxString& resource); // Load from .rc resource
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
+    wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
+    wxAcceleratorTable( int                n
+                       ,wxAcceleratorEntry vaEntries[]
+                      ); // Load from array

 
     // Copy constructors
 
     // Copy constructors

-    inline wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
-    inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
+    inline wxAcceleratorTable(const wxAcceleratorTable& rAccel) { Ref(rAccel); }
+    inline wxAcceleratorTable(const wxAcceleratorTable* pAccel) { if (pAccel) Ref(*pAccel); }

 
     ~wxAcceleratorTable();
 
 
     ~wxAcceleratorTable();
 

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

 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);
 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);

-    WXHACCEL GetHACCEL() const;
+    WXHACCEL GetHACCEL(void) const;

 
     // translate the accelerator, return TRUE if done
 
     // translate the accelerator, return TRUE if done

-    bool Translate(wxWindow *window, WXMSG *msg) const;
+    bool Translate( WXHWND hWnd
+                   ,WXMSG* pMsg
+                  ) const;

 };
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 };
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;