test whether pointer is non-NULL before using it, not after, in wxAnimation::Load...

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 37741420271225b772400e811e1bd6034fdfe9e5..025ca8bb0fa901f1ae11710be7baba9400b41031 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

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

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


@@ -27,13 +27,13 @@ public:
 
     // in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
     // declare this function directly in gtk header
 
     // in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
     // declare this function directly in gtk header

-#ifndef __WXGTK__
+#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);
     // 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 // __WXGTK__
+#endif // ! native __WXGTK__

 
     // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }
 
     // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }


@@ -49,8 +49,10 @@ private:
     #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(__WXGTK__)
+    #include "wx/gtk1/stattext.h"

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