#4479: wx.ComboBox needs a SetFont method

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 05059831bb41531cc24ef37e8fcdbae8f87f3de7..d23d88d4c1d6b87758ab388dde52fe026a7f6a4b 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -29,9 +29,9 @@
 #define wxST_ELLIPSIZE_END         0x0010
 
 
-extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[];
 
-class WXDLLEXPORT wxStaticTextBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl
 {
 public:
     wxStaticTextBase() { }
@@ -72,6 +72,9 @@ public:
 
 protected:      // functions required for wxST_ELLIPSIZE_* support
 
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // just calls RemoveMarkup & Ellipsize on the original label.
     virtual wxString GetEllipsizedLabelWithoutMarkup() const;
 
@@ -108,7 +111,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/stattext.h"
+    #include "wx/osx/stattext.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)