X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/univ/control.h

diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h
index 4d7d370ab1..2c8afed8f6 100644
--- a/include/wx/univ/control.h
+++ b/include/wx/univ/control.h
@@ -32,13 +32,13 @@ typedef wxString wxControlAction;
 // the list of actions which apply to all controls (other actions are defined
 // in the controls headers)
 
-#define wxACTION_NONE    _T("")           // no action to perform
+#define wxACTION_NONE    wxT("")           // no action to perform
 
 // ----------------------------------------------------------------------------
 // wxControl: the base class for all GUI controls
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase, public wxInputConsumer
 {
 public:
     wxControl() { Init(); }
@@ -71,18 +71,13 @@ public:
 
     // wxUniversal-specific methods
 
-    // return the accel index in the string or -1 if none and puts the modified
-    // string into second parameter if non NULL
-    static int FindAccelIndex(const wxString& label,
-                              wxString *labelOnly = NULL);
-
     // return the index of the accel char in the label or -1 if none
     int GetAccelIndex() const { return m_indexAccel; }
 
     // return the accel char itself or 0 if none
     wxChar GetAccelChar() const
     {
-        return m_indexAccel == -1 ? _T('\0') : (wxChar)m_label[m_indexAccel];
+        return m_indexAccel == -1 ? wxT('\0') : (wxChar)m_label[m_indexAccel];
     }
 
     virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }