Improved wxTextCtrl's wrapping behaviour

wxGTK package corrections


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/gtk/Setup

@@ -34,9 +34,14 @@ MY_LINKCC=$(CCC)
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 TARGETDIR=$(BINLIBDEST)/wxPython
 
-
 wxc	wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
 	mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
-	frames.cpp stattool.cpp utils.cpp windows3.cpp \
+	frames.cpp stattool.cpp windows3.cpp image.cpp \
-	-I. $(WX_CONFIG_CFLAGS) -DSWIG_GLOBAL
+	utils.cpp \
+	## comment out the next line to disable wxGLCanvas
+	##_glcanvas.cpp glcanvas.cpp -DWITH_GLCANVAS -lGL -lGLU \
+	-I. $(WX_CONFIG_CFLAGS) -I/usr/local/lib/glib/include \
+	-DSWIG_GLOBAL -DWXP_WITH_THREAD $(SEPARATE) -Xlinker $(WX_CONFIG_LIBS)
+
+
 

distrib/gtk/copy_src

@@ -282,11 +282,11 @@ cp ./tests/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/tests
 cp ./tests/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/tests
 
 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo
-cp ./tests/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/demo
-cp ./tests/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/demo
-cp ./tests/*.pyc ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/*.pyc ~/wxgtk_dist/wxGTK/utils/wxPython/demo
 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
-cp ./tests/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
+cp ./demo/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
 
 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps
 cp ./tests/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps

src/gtk/textctrl.cpp

@@ -158,6 +158,9 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                        0, 0);
 
+        /* always wrap words */
+        gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
+	
         /* put the horizontal scrollbar in the lower left hand corner */
         if (bHasHScrollbar)
         {
@@ -169,6 +172,11 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                        GTK_FILL,
                        0, 0);
             gtk_widget_show(hscrollbar);
+
+#if (GTK_MINOR_VERSION > 0)
+	    /* don't wrap lines, otherwise we wouldn't need the scrollbar */
+	    gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE );
+#endif
         }
 	
         /* finally, put the vertical scrollbar in the upper right corner */

src/gtk1/textctrl.cpp

@@ -158,6 +158,9 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                        0, 0);
 
+        /* always wrap words */
+        gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
+	
         /* put the horizontal scrollbar in the lower left hand corner */
         if (bHasHScrollbar)
         {
@@ -169,6 +172,11 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                        GTK_FILL,
                        0, 0);
             gtk_widget_show(hscrollbar);
+
+#if (GTK_MINOR_VERSION > 0)
+	    /* don't wrap lines, otherwise we wouldn't need the scrollbar */
+	    gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE );
+#endif
         }
 	
         /* finally, put the vertical scrollbar in the upper right corner */