more f*h interface file revisions

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 8795777ea8d1bf8677e52523c971cd627734182b..d23d88d4c1d6b87758ab388dde52fe026a7f6a4b 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -29,9 +29,9 @@
 #define wxST_ELLIPSIZE_END         0x0010
 
 
 #define wxST_ELLIPSIZE_END         0x0010
 
 

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

 
 

-class WXDLLEXPORT wxStaticTextBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl

 {
 public:
     wxStaticTextBase() { }
 {
 public:
     wxStaticTextBase() { }


@@ -58,6 +58,9 @@ public:
 
     // public utilities (symmetric to those in wxControl about mnemonics):
 
 
     // public utilities (symmetric to those in wxControl about mnemonics):
 

+    // get the string without mnemonic characters ('&') and without markup
+    static wxString GetLabelText(const wxString& label);
+

     // removes the markup accepted by wxStaticText when wxST_MARKUP is used,
     // and then returns the cleaned string
     static wxString RemoveMarkup(const wxString& str);
     // removes the markup accepted by wxStaticText when wxST_MARKUP is used,
     // and then returns the cleaned string
     static wxString RemoveMarkup(const wxString& str);


@@ -69,6 +72,9 @@ public:
 
 protected:      // functions required for wxST_ELLIPSIZE_* support
 
 
 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;
 
     // just calls RemoveMarkup & Ellipsize on the original label.
     virtual wxString GetEllipsizedLabelWithoutMarkup() const;
 


@@ -105,7 +111,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)