X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5226ac62f121ecfde6cca2569c51beb92c7cdd29..5c80fea840f43976c0903a0dd6f87f046d09d555:/include/wx/control.h

diff --git a/include/wx/control.h b/include/wx/control.h
index 7a70a4c156..08e9aeceea 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -22,7 +22,7 @@
 
 #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
@@ -92,6 +92,9 @@ public:
     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,