Minor header cleaning.

[wxWidgets.git] / src / motif / accel.cpp

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index 46adbcc4b6724d3468f0a02db32c4ad50b56b647..1a2f7fd39356342f7be3588e07e7b71a5ec396c3 100644 (file)
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        accel.cpp
+// Name:        src/motif/accel.cpp

 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:


@@ -9,27 +9,27 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "accel.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "wx/setup.h"

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

-#include "wx/string.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/utils.h"
+#endif
+

 #include <ctype.h>
 
 #include <ctype.h>
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)

-#endif

 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
     friend class WXDLLEXPORT wxAcceleratorTable;
 public:
     wxAcceleratorRefData();
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
     friend class WXDLLEXPORT wxAcceleratorTable;
 public:
     wxAcceleratorRefData();

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

 public:
     int m_count;
     wxAcceleratorEntry* m_entries;
 public:
     int m_count;
     wxAcceleratorEntry* m_entries;


@@ -61,26 +61,26 @@ wxAcceleratorTable::~wxAcceleratorTable()
 }
 
 // Load from .rc resource
 }
 
 // Load from .rc resource

-wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
+wxAcceleratorTable::wxAcceleratorTable(const wxString& WXUNUSED(resource))

 {
     m_refData = new wxAcceleratorRefData;
 }
 
 // Create from an array
 {
     m_refData = new wxAcceleratorRefData;
 }
 
 // Create from an array

-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])

 {
     wxAcceleratorRefData* data = new wxAcceleratorRefData;
     m_refData = data;
 {
     wxAcceleratorRefData* data = new wxAcceleratorRefData;
     m_refData = data;

-    
+

     data->m_count = n;
     data->m_entries = new wxAcceleratorEntry[n];
     int i;
     for (i = 0; i < n; i++)
         data->m_entries[i] = entries[i];
     data->m_count = n;
     data->m_entries = new wxAcceleratorEntry[n];
     int i;
     for (i = 0; i < n; i++)
         data->m_entries[i] = entries[i];

-    
+

 }
 
 }
 

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

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


@@ -101,18 +101,17 @@ bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const
     bool eventAltDown = event.AltDown();
     bool eventCtrlDown = event.ControlDown();
     bool eventShiftDown = event.ShiftDown();
     bool eventAltDown = event.AltDown();
     bool eventCtrlDown = event.ControlDown();
     bool eventShiftDown = event.ShiftDown();

-    int  eventKeyCode = event.KeyCode();
-    
+    int  eventKeyCode = event.GetKeyCode();
+

     bool accAltDown = ((GetFlags() & wxACCEL_ALT) == wxACCEL_ALT);
     bool accCtrlDown = ((GetFlags() & wxACCEL_CTRL) == wxACCEL_CTRL);
     bool accShiftDown = ((GetFlags() & wxACCEL_SHIFT) == wxACCEL_SHIFT);
     int  accKeyCode = GetKeyCode();
     int  accKeyCode2 = GetKeyCode();
     if (isascii(accKeyCode2))
     bool accAltDown = ((GetFlags() & wxACCEL_ALT) == wxACCEL_ALT);
     bool accCtrlDown = ((GetFlags() & wxACCEL_CTRL) == wxACCEL_CTRL);
     bool accShiftDown = ((GetFlags() & wxACCEL_SHIFT) == wxACCEL_SHIFT);
     int  accKeyCode = GetKeyCode();
     int  accKeyCode2 = GetKeyCode();
     if (isascii(accKeyCode2))

-        accKeyCode2 = wxToLower(accKeyCode2);
-    
+        accKeyCode2 = tolower(accKeyCode2);
+

     return ((eventAltDown == accAltDown) && (eventCtrlDown == accCtrlDown) &&
         (eventShiftDown == accShiftDown) &&
         ((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ;
 }
     return ((eventAltDown == accAltDown) && (eventCtrlDown == accCtrlDown) &&
         (eventShiftDown == accShiftDown) &&
         ((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ;
 }

-