show the standard wxWin fonts (modified patch 530698)

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

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index 46adbcc4b6724d3468f0a02db32c4ad50b56b647..d90a47b95863a50650286ef580c7ca34b9aee979 100644 (file)
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -19,9 +19,7 @@
 #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
 {


@@ -29,7 +27,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 public:
     wxAcceleratorRefData();
     ~wxAcceleratorRefData();
 public:
     wxAcceleratorRefData();
     ~wxAcceleratorRefData();

-    
+

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


@@ -61,7 +59,7 @@ 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;
 }
 {
     m_refData = new wxAcceleratorRefData;
 }


@@ -71,13 +69,13 @@ wxAcceleratorTable::wxAcceleratorTable(int n, 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::Ok() const


@@ -102,15 +100,15 @@ bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const
     bool eventCtrlDown = event.ControlDown();
     bool eventShiftDown = event.ShiftDown();
     int  eventKeyCode = event.KeyCode();
     bool eventCtrlDown = event.ControlDown();
     bool eventShiftDown = event.ShiftDown();
     int  eventKeyCode = event.KeyCode();

-    
+

     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))) ;