[ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation'

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

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index ca8624f3e7089e4343ad479c612b53f659706e69..c1e6426f2225f2be37798f3a2dca699c58cbbe11 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,19 +9,19 @@
 // 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"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+

 #include "wx/utils.h"
 #include <ctype.h>
 
 #include "wx/utils.h"
 #include <ctype.h>
 

-#if !USE_SHARED_LIBRARIES

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

-#endif

 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {


@@ -61,13 +61,13 @@ 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;


@@ -101,7 +101,7 @@ 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 accAltDown = ((GetFlags() & wxACCEL_ALT) == wxACCEL_ALT);
     bool accCtrlDown = ((GetFlags() & wxACCEL_CTRL) == wxACCEL_CTRL);


@@ -109,10 +109,9 @@ bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const
     int  accKeyCode = GetKeyCode();
     int  accKeyCode2 = GetKeyCode();
     if (isascii(accKeyCode2))
     int  accKeyCode = GetKeyCode();
     int  accKeyCode2 = GetKeyCode();
     if (isascii(accKeyCode2))

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

 
     return ((eventAltDown == accAltDown) && (eventCtrlDown == accCtrlDown) &&
 
     return ((eventAltDown == accAltDown) && (eventCtrlDown == accCtrlDown) &&

-            (eventShiftDown == accShiftDown) &&
-              ((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ;
+        (eventShiftDown == accShiftDown) &&
+        ((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ;

 }
 }

-