Reorganize wxCollapsiblePane event and layout code under GTK+

[wxWidgets.git] / src / common / accelcmn.cpp

diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index a038c58d206b94e5be2cd2bb610d2bd63fddb86c..9d5898177b376666291cd87b85f730884856fe3c 100644 (file)
--- a/src/common/accelcmn.cpp
+++ b/src/common/accelcmn.cpp
@@ -27,7 +27,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/intl.h"
+    #include "wx/log.h"

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

+    #include "wx/crt.h"

 #endif //WX_PRECOMP
 
 // ============================================================================
 #endif //WX_PRECOMP
 
 // ============================================================================


@@ -37,7 +40,7 @@
 static const struct wxKeyName
 {
     wxKeyCode code;
 static const struct wxKeyName
 {
     wxKeyCode code;

-    const wxChar *name;
+    const char *name;

 } wxKeyNames[] =
 {
     { WXK_DELETE, wxTRANSLATE("DEL") },
 } wxKeyNames[] =
 {
     { WXK_DELETE, wxTRANSLATE("DEL") },


@@ -111,7 +114,7 @@ static const struct wxKeyName
 //
 // as accels can be either translated or not, check for both possibilities and
 // also compare case-insensitively as the key names case doesn't count
 //
 // as accels can be either translated or not, check for both possibilities and
 // also compare case-insensitively as the key names case doesn't count

-static inline bool CompareAccelString(const wxString& str, const wxChar *accel)
+static inline bool CompareAccelString(const wxString& str, const char *accel)

 {
     return str.CmpNoCase(accel) == 0
 #if wxUSE_INTL
 {
     return str.CmpNoCase(accel) == 0
 #if wxUSE_INTL


@@ -125,7 +128,7 @@ static inline bool CompareAccelString(const wxString& str, const wxChar *accel)
 //
 // first and last parameter specify the valid domain for "number" part
 static int IsNumberedAccelKey(const wxString& str,
 //
 // first and last parameter specify the valid domain for "number" part
 static int IsNumberedAccelKey(const wxString& str,

-                              const wxChar *prefix,
+                              const char *prefix,

                               wxKeyCode prefixCode,
                               unsigned first,
                               unsigned last)
                               wxKeyCode prefixCode,
                               unsigned first,
                               unsigned last)