always let the multiline text control process the Enter key presses

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 0f29f9834b4b7f92edc18291626f087ebf2ca059..0eb58a33979cf35e14d067f4c5aa039ce605cebd 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -5,7 +5,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

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

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


@@ -22,8 +22,6 @@ public:
     #include "wx/motif/stattext.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/stattext.h"
     #include "wx/motif/stattext.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/stattext.h"

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

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