use Print Manager session APIs if PM_USE_SESSION_APIS is true

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

diff --git a/src/gtk/accel.cpp b/src/gtk/accel.cpp
index b15ece737966754d85115392d89bd19202c9fad7..f3f9ba6a686cf67876361ab94261dd6d13f27b33 100644 (file)
--- a/src/gtk/accel.cpp
+++ b/src/gtk/accel.cpp
@@ -2,9 +2,9 @@
 // Name:        accel.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        accel.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $id:$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,14 +13,9 @@
 
 #include "wx/accel.h"
 
 
 #include "wx/accel.h"
 

-#include <ctype.h>
+#if wxUSE_ACCEL

 
 

-#ifdef __WXDEBUG__
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL ((void*)0L)
-#endif
+#include <ctype.h>

 
 //-----------------------------------------------------------------------------
 // wxAcceleratorTable
 
 //-----------------------------------------------------------------------------
 // wxAcceleratorTable


@@ -29,13 +24,12 @@
 class wxAccelRefData: public wxObjectRefData
 {
 public:
 class wxAccelRefData: public wxObjectRefData
 {
 public:

-  
-  wxAccelRefData(void);
-  
-  wxList m_accels;
+    wxAccelRefData();
+
+    wxList m_accels;

 };
 
 };
 

-wxAccelRefData::wxAccelRefData(void)
+wxAccelRefData::wxAccelRefData()

 {
     m_accels.DeleteContents( TRUE );
 }
 {
     m_accels.DeleteContents( TRUE );
 }


@@ -45,7 +39,7 @@ wxAccelRefData::wxAccelRefData(void)
 #define M_ACCELDATA ((wxAccelRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable,wxObject)
 #define M_ACCELDATA ((wxAccelRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable,wxObject)

-  
+

 wxAcceleratorTable::wxAcceleratorTable()
 {
 }
 wxAcceleratorTable::wxAcceleratorTable()
 {
 }


@@ -53,13 +47,13 @@ wxAcceleratorTable::wxAcceleratorTable()
 wxAcceleratorTable::wxAcceleratorTable( int n, wxAcceleratorEntry entries[] )
 {
     m_refData = new wxAccelRefData();
 wxAcceleratorTable::wxAcceleratorTable( int n, wxAcceleratorEntry entries[] )
 {
     m_refData = new wxAccelRefData();

-  
+

     for (int i = 0; i < n; i++)
     {
         int flag    = entries[i].GetFlags();
         int keycode = entries[i].GetKeyCode();
         int command = entries[i].GetCommand();
     for (int i = 0; i < n; i++)
     {
         int flag    = entries[i].GetFlags();
         int keycode = entries[i].GetKeyCode();
         int command = entries[i].GetCommand();

-        if ((keycode >= (int)'A') && (keycode <= (int)'Z')) keycode = (int)tolower( (char)keycode );
+        if ((keycode >= (int)'a') && (keycode <= (int)'z')) keycode = (int)toupper( (char)keycode );

         M_ACCELDATA->m_accels.Append( new wxAcceleratorEntry( flag, keycode, command ) );
     }
 }
         M_ACCELDATA->m_accels.Append( new wxAcceleratorEntry( flag, keycode, command ) );
     }
 }


@@ -85,12 +79,13 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
            (((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_CTRL) == 0) || event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&
            (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown()))

-       {
+        {

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

-       }
+        }

         node = node->Next();
     }
         node = node->Next();
     }

-  
+

     return -1;
 }
 
     return -1;
 }
 

+#endif