Added missing URL attribute testing

[wxWidgets.git] / src / mac / carbon / accel.cpp

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 69ad642818b21807498cbcb73f0836b03e67eb17..d15f4546263d171096e6b18466c39cb3ffbfc32f 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        accel.cpp
+// Name:        src/mac/carbon/accel.cpp

 // Purpose:     wxAcceleratorTable
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxAcceleratorTable
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,26 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #include "wx/wxprec.h"
 
 #include "wx/accel.h"
 #include "wx/wxprec.h"
 
 #include "wx/accel.h"

-#include "wx/string.h"

 
 

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+#ifndef WX_PRECOMP
+    #include "wx/string.h"

 #endif
 
 #endif
 

+IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+

 // ----------------------------------------------------------------------------
 // wxAccelList: a list of wxAcceleratorEntries
 // ----------------------------------------------------------------------------
 
 WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
 #include "wx/listimpl.cpp"
 // ----------------------------------------------------------------------------
 // wxAccelList: a list of wxAcceleratorEntries
 // ----------------------------------------------------------------------------
 
 WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxAccelList);
+WX_DEFINE_LIST(wxAccelList)

 
 // ----------------------------------------------------------------------------
 // wxAccelRefData: the data used by wxAcceleratorTable
 
 // ----------------------------------------------------------------------------
 // wxAccelRefData: the data used by wxAcceleratorTable


@@ -36,10 +33,10 @@ WX_DEFINE_LIST(wxAccelList);
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {

-    friend class WXDLLEXPORT wxAcceleratorTable;
+    friend class wxAcceleratorTable;

 public:
     wxAcceleratorRefData();
 public:
     wxAcceleratorRefData();

-    ~wxAcceleratorRefData();
+    virtual ~wxAcceleratorRefData();

 
     wxAccelList m_accels;
 };
 
     wxAccelList m_accels;
 };


@@ -80,7 +77,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     }
 }
 
     }
 }
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }


@@ -96,7 +93,8 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
         if ((event.m_keyCode == entry->GetKeyCode()) &&
            (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&
         if ((event.m_keyCode == entry->GetKeyCode()) &&
            (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&

-           (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown()))
+           (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown()) && 
+           (((entry->GetFlags() & wxACCEL_CMD) == 0) || event.CmdDown()))

         {
             return entry->GetCommand();
         }
         {
             return entry->GetCommand();
         }


@@ -105,5 +103,3 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 
     return -1;
 }
 
     return -1;
 }

-
-