some != NULL checks

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

diff --git a/src/gtk/accel.cpp b/src/gtk/accel.cpp
index 3d161f1c3142891e0c3c586ae42513b1bb5c2d46..9b861acb2042ab792355728057b49586b5ed8a8b 100644 (file)
--- a/src/gtk/accel.cpp
+++ b/src/gtk/accel.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $id:$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $id:$
 // Copyright:   (c) 1998 Robert Roebling

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

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


@@ -24,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 );
 }


@@ -40,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()
 {
 }


@@ -48,7 +47,7 @@ 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();
     for (int i = 0; i < n; i++)
     {
         int flag    = entries[i].GetFlags();


@@ -80,12 +79,12 @@ 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;
 }