X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3141a349e438c71338085ea2e713e716ca2c613..edc09871744140f16b2ef6b7abaa2289d7deb260:/include/wx/accel.h

diff --git a/include/wx/accel.h b/include/wx/accel.h
index 8ce5622370..80f35ede71 100644
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -62,6 +62,10 @@ public:
         , m_item(entry.m_item)
         { }
 
+    // create accelerator corresponding to the specified string, return NULL if
+    // string couldn't be parsed or a pointer to be deleted by the caller
+    static wxAcceleratorEntry *Create(const wxString& str);
+
     wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry)
     {
         Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
@@ -100,7 +104,31 @@ public:
     bool MatchesEvent(const wxKeyEvent& event) const;
 #endif
 
+    bool IsOk() const
+    {
+        return m_flags != 0 &&
+               m_keyCode != 0;
+    }
+
+
+    // string <-> wxAcceleratorEntry conversion
+    // ----------------------------------------
+
+    // returns a wxString for the this accelerator.
+    // this function formats it using the <flags>-<keycode> format
+    // where <flags> maybe a hyphen-separed list of "shift|alt|ctrl"
+    wxString ToString() const;
+
+    // returns true if the given string correctly initialized this object
+    // (i.e. if IsOk() returns true after this call)
+    bool FromString(const wxString& str);
+
+
 private:
+    // common part of Create() and FromString()
+    static bool ParseAccel(const wxString& str, int *flags, int *keycode);
+
+
     int m_flags;    // combination of wxACCEL_XXX constants
     int m_keyCode;  // ASCII or virtual keycode
     int m_command;  // Command id to generate