no changes, just corrected the comment for wxConvLocal

[wxWidgets.git] / include / wx / accel.h

diff --git a/include/wx/accel.h b/include/wx/accel.h
index 6c3b950e1ecdd75be403506ff8bf90ec5dff92cf..5e22e956231df62ba65d13cd98f20d122c36357d 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     31.05.01 (extracted from other files)
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     31.05.01 (extracted from other files)
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_BASE_


@@ -62,7 +62,7 @@ public:
         Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
         return *this;
     }
         Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
         return *this;
     }

-    
+

     void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL)
     {
         m_flags = flags;
     void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL)
     {
         m_flags = flags;


@@ -94,7 +94,7 @@ public:
     // Implementation use only
     bool MatchesEvent(const wxKeyEvent& event) const;
 #endif
     // Implementation use only
     bool MatchesEvent(const wxKeyEvent& event) const;
 #endif

-    
+

 private:
     int m_flags;    // combination of wxACCEL_XXX constants
     int m_keyCode;  // ASCII or virtual keycode
 private:
     int m_flags;    // combination of wxACCEL_XXX constants
     int m_keyCode;  // ASCII or virtual keycode


@@ -118,15 +118,19 @@ private:
     #include "wx/msw/accel.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/accel.h"
     #include "wx/msw/accel.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/accel.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

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

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/accel.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/generic/accel.h"

 #elif defined(__WXPM__)
     #include "wx/os2/accel.h"
 #endif
 
 #elif defined(__WXPM__)
     #include "wx/os2/accel.h"
 #endif
 

-WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable;

 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL