no changes, just remove #if'd out code

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 05059831bb41531cc24ef37e8fcdbae8f87f3de7..f8d7ede736f1e583001f94456e22f2eb3f91a076 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -23,15 +23,13 @@
  */
 #define wxST_NO_AUTORESIZE         0x0001
 #define wxST_MARKUP                0x0002
  */
 #define wxST_NO_AUTORESIZE         0x0001
 #define wxST_MARKUP                0x0002

-

 #define wxST_ELLIPSIZE_START       0x0004
 #define wxST_ELLIPSIZE_MIDDLE      0x0008
 #define wxST_ELLIPSIZE_END         0x0010
 
 #define wxST_ELLIPSIZE_START       0x0004
 #define wxST_ELLIPSIZE_MIDDLE      0x0008
 #define wxST_ELLIPSIZE_END         0x0010
 

+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[];

 
 

-extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[];
-
-class WXDLLEXPORT wxStaticTextBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl

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


@@ -65,13 +63,15 @@ public:
     // and then returns the cleaned string
     static wxString RemoveMarkup(const wxString& str);
 
     // and then returns the cleaned string
     static wxString RemoveMarkup(const wxString& str);
 

-    // escapes the alls special symbols (<>"'&) present inside the given string
+    // escapes all special symbols (<>"'&) present in the given string

     // using the corresponding entities (&lt; &gt; &quot; &apos; &amp;)
     static wxString EscapeMarkup(const wxString& str);
 
     // using the corresponding entities (&lt; &gt; &quot; &apos; &amp;)
     static wxString EscapeMarkup(const wxString& str);
 

-

 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;
 


@@ -94,9 +94,12 @@ protected:      // functions required for wxST_ELLIPSIZE_* support
     virtual void DoSetLabel(const wxString& WXUNUSED(str)) { }
 
 private:
     virtual void DoSetLabel(const wxString& WXUNUSED(str)) { }
 
 private:

-    DECLARE_NO_COPY_CLASS(wxStaticTextBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticTextBase);

 };
 
 };
 

+// see wx/generic/stattextg.h for the explanation
+#ifndef wxNO_PORT_STATTEXT_INCLUDE
+

 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/stattext.h"
 #elif defined(__WXMSW__)
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/stattext.h"
 #elif defined(__WXMSW__)


@@ -108,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__)


@@ -117,7 +120,8 @@ private:
     #include "wx/palmos/stattext.h"
 #endif
 
     #include "wx/palmos/stattext.h"
 #endif
 

+#endif // !wxNO_PORT_STATTEXT_INCLUDE
+

 #endif // wxUSE_STATTEXT
 
 #endif // wxUSE_STATTEXT
 

-#endif
-    // _WX_STATTEXT_H_BASE_
+#endif // _WX_STATTEXT_H_BASE_