A bit of scrolling works under GTK 2.0

[wxWidgets.git] / src / univ / textctrl.cpp

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 2f552fe06337ca85259236beddaea709efe75dcb..13d8d1054c036bb4b576b07d922ff6663b4a69a5 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -150,6 +150,10 @@
 
 #include "wx/cmdproc.h"
 
+#if wxUSE_CLIPBOARD
+#include "wx/dataobj.h"
+#endif
+
 // turn extra wxTextCtrl-specific debugging on/off
 #define WXDEBUG_TEXT
 
@@ -661,11 +665,14 @@ bool wxTextCtrl::Create(wxWindow *parent,
             style |= wxALWAYS_SHOW_SB;
         }
 
+        // wxTE_WORDWRAP is 0 for now so we don't need the code below
+#if 0
         if ( style & wxTE_WORDWRAP )
         {
             // wrapping words means wrapping, hence no horz scrollbar
             style &= ~wxHSCROLL;
         }
+#endif // 0
 
         // TODO: support wxTE_NO_VSCROLL (?)
 
@@ -684,6 +691,11 @@ bool wxTextCtrl::Create(wxWindow *parent,
         // create data object for single line controls
         m_data.sdata = new wxTextSingleLineData;
     }
+    
+#if wxUSE_TWO_WINDOWS
+    if ((style & wxBORDER_MASK) == 0)
+        style |= wxBORDER_SUNKEN;
+#endif
 
     if ( !wxControl::Create(parent, id, pos, size, style,
                             validator, name) )