Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 156290f84af440f42c35566edc3d24b800db7965..41dea675756a590c016d32cc486b62fa3ee4204a 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/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
 


@@ -20,76 +20,27 @@
 #include "wx/string.h"
 #include "wx/event.h"
 
 #include "wx/string.h"
 #include "wx/event.h"
 

-class WXDLLEXPORT wxAcceleratorTable;
-
-#if 0
-// Hold Ctrl key down
-#define wxACCEL_ALT     0x01
-
-// Hold Ctrl key down
-#define wxACCEL_CTRL    0x02
-
- // Hold Shift key down
-#define wxACCEL_SHIFT   0x04
-
- // Hold no key down
-#define wxACCEL_NORMAL  0x00
-
-class WXDLLEXPORT wxAcceleratorEntry
-{
-public:
-    wxAcceleratorEntry(const wxAcceleratorEntry& entry)
-    {
-        m_flags = entry.m_flags; m_keyCode = entry.m_keyCode; m_command = entry.m_command;
-    }
-    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
-    {
-        m_flags = flags; m_keyCode = keyCode; m_command = cmd;
-    }
-
-    void Set(int flags, int keyCode, int cmd)
-         { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
-
-    int GetFlags() const { return m_flags; }
-    int GetKeyCode() const { return m_keyCode; }
-    int GetCommand() const { return m_command; }
-
-    void operator = (const wxAcceleratorEntry& entry)
-    {
-        m_flags = entry.m_flags; m_keyCode = entry.m_keyCode; m_command = entry.m_command;
-    }
-
-    // Implementation use only
-    bool MatchesEvent(const wxKeyEvent& event) const;
-
-public:
-    int          m_flags;
-    int          m_keyCode; // ASCII or virtual keycode
-    int          m_command; // Command id to generate
-};
-#endif
-

 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 {
 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 {

-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)

 public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource

-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
-
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
+    

     // Copy constructors
     wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
     wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
     // Copy constructors
     wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
     wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }

-
+    

     ~wxAcceleratorTable();
     ~wxAcceleratorTable();

-
+    

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

-
+    

     bool Ok() const;
     bool Ok() const;

-
-// Implementation only
+    
+    // Implementation only

     int GetCount() const;
     wxAcceleratorEntry* GetEntries() const;
 };
     int GetCount() const;
     wxAcceleratorEntry* GetEntries() const;
 };


@@ -97,4 +48,4 @@ public:
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif

-    // _WX_ACCEL_H_
+// _WX_ACCEL_H_