fix aui crash related to SF bug 1531361

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 0f29f9834b4b7f92edc18291626f087ebf2ca059..025ca8bb0fa901f1ae11710be7baba9400b41031 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,17 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        stattext.h
+// Purpose:     wxStaticText base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_STATTEXT_H_BASE_
 #define _WX_STATTEXT_H_BASE_
 
 #ifndef _WX_STATTEXT_H_BASE_
 #define _WX_STATTEXT_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_STATTEXT
 
 #include "wx/control.h"
 
 #if wxUSE_STATTEXT
 
 #include "wx/control.h"
 

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

 
 class WXDLLEXPORT wxStaticTextBase : public wxControl
 {
 public:
 
 class WXDLLEXPORT wxStaticTextBase : public wxControl
 {
 public:

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    wxStaticTextBase() { }
+
+    // in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
+    // declare this function directly in gtk header
+#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)
+    // wrap the text of the control so that no line is longer than the given
+    // width (if possible: this function won't break words)
+    //
+    // NB: implemented in dlgcmn.cpp for now
+    void Wrap(int width);
+#endif // ! native __WXGTK__
+
+    // overriden base virtuals
+    virtual bool AcceptsFocus() const { return false; }
+    virtual bool HasTransparentBackground() { return true; }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxStaticTextBase)

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -20,16 +49,18 @@ public:
     #include "wx/msw/stattext.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/stattext.h"
     #include "wx/msw/stattext.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/stattext.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/stattext.h"
     #include "wx/gtk/stattext.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/stattext.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/stattext.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/stattext.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/stattext.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/stattext.h"

 #elif defined(__WXPM__)
     #include "wx/os2/stattext.h"
 #elif defined(__WXPM__)
     #include "wx/os2/stattext.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/stattext.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/stattext.h"

 #endif
 
 #endif // wxUSE_STATTEXT
 #endif
 
 #endif // wxUSE_STATTEXT