Minor corrections to make dist after reports

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

diff --git a/include/wx/control.h b/include/wx/control.h
index cf939b5459ec15abee89dac2c011666563614cb0..ecc897525c9aba608a02f2cc33697ec727298934 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -22,13 +22,13 @@
 
 #include "wx/window.h"      // base class
 
-extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxControlBase : public wxWindow
+class WXDLLIMPEXP_CORE wxControlBase : public wxWindow
 {
 public:
     wxControlBase() { }
@@ -73,9 +73,6 @@ public:
     // 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
@@ -95,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,
@@ -131,7 +131,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/control.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/control.h"
+    #include "wx/osx/control.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/control.h"
 #elif defined(__WXPM__)