Better fix

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

diff --git a/include/wx/control.h b/include/wx/control.h
index cf939b5459ec15abee89dac2c011666563614cb0..08e9aeceea97d08a872f936af53896283f70c995 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -22,7 +22,7 @@
 
 #include "wx/window.h"      // base class
 
 
 #include "wx/window.h"      // base class
 

-extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxControlNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls


@@ -73,9 +73,6 @@ public:
     // removes the mnemonics characters
     static wxString RemoveMnemonics(const wxString& str);
 
     // removes the mnemonics characters
     static wxString RemoveMnemonics(const wxString& str);
 

-    // escapes the mnemonics characters ('&') by doubling them
-    static wxString EscapeMnemonics(const wxString& str);
-

 
     // controls by default inherit the colours of their parents, if a
     // particular control class doesn't want to do it, it can override
 
     // controls by default inherit the colours of their parents, if a
     // particular control class doesn't want to do it, it can override


@@ -95,6 +92,9 @@ public:
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
 
 protected:
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
 
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const;
+

     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
     bool CreateControl(wxWindowBase *parent,
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
     bool CreateControl(wxWindowBase *parent,