deprecate wxTE_AUTO_SCROLL as it's always on in the ports which support it anyhow...

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 650b4af487ef6989315d1f549b1d8e463aac35d6..2debff6ff796ddf6b0c64cd8d53b8dea383fcff7 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -225,7 +225,7 @@ Deprecated methods and their replacements
   passed to it was interpreted in physical, not logical, coordinates. Replace
   it with SetDeviceClippingRegion() if this was the correct thing to do in your
   code.
   passed to it was interpreted in physical, not logical, coordinates. Replace
   it with SetDeviceClippingRegion() if this was the correct thing to do in your
   code.

-
+- wxTE_AUTO_SCROLL style is deprecated as it's always on by default anyhow.

 
 
 Major new features in this release
 
 
 Major new features in this release

diff --git a/docs/doxygen/overviews/changes_since28.h b/docs/doxygen/overviews/changes_since28.h
index 286671a76a86a4d463bfb99683ce2463c050de5d..b8b087624e05bce9a9319d8677a1ddc03e4761e0 100644 (file)
--- a/docs/doxygen/overviews/changes_since28.h
+++ b/docs/doxygen/overviews/changes_since28.h
@@ -149,5 +149,9 @@ Finally, a few structure fields, notable @c wxCmdLineEntryDesc::shortName,
 
   Of course, this will change the format of the wxConfig output which may be
   undesirable.
 
   Of course, this will change the format of the wxConfig output which may be
   undesirable.

+
+- wxTE_AUTO_SCROLL style is deprecated as it's always on by default anyhow in
+  the ports which support it so you should simply remove any mentions of it
+  from your code.

 */
 
 */
 

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 0aae25a47947bbdfbedadac82f17e47b81b5ede5..d92157292a4ee0c367b42d922e778bd5dca2d568 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -65,7 +65,6 @@ const wxTextCoord wxInvalidTextCoord    = -2;
 // ----------------------------------------------------------------------------
 
 #define wxTE_NO_VSCROLL     0x0002
 // ----------------------------------------------------------------------------
 
 #define wxTE_NO_VSCROLL     0x0002

-#define wxTE_AUTO_SCROLL    0x0008

 
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020


@@ -108,6 +107,11 @@ const wxTextCoord wxInvalidTextCoord    = -2;
     #define wxTE_LINEWRAP       wxTE_CHARWRAP
 #endif // WXWIN_COMPATIBILITY_2_6
 
     #define wxTE_LINEWRAP       wxTE_CHARWRAP
 #endif // WXWIN_COMPATIBILITY_2_6
 

+#if WXWIN_COMPATIBILITY_2_8
+    // this style is (or at least should be) on by default now, don't use it
+    #define wxTE_AUTO_SCROLL    0
+#endif // WXWIN_COMPATIBILITY_2_8
+

 // force using RichEdit version 2.0 or 3.0 instead of 1.0 (default) for
 // wxTE_RICH controls - can be used together with or instead of wxTE_RICH
 #define wxTE_RICH2          0x8000
 // force using RichEdit version 2.0 or 3.0 instead of 1.0 (default) for
 // wxTE_RICH controls - can be used together with or instead of wxTE_RICH
 #define wxTE_RICH2          0x8000

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index e6eb4b3a83e8bcac2af891a29774a9f791e0ba5d..bc42be31a1d8db356870512d3c33f0c1b22d1bd9 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -672,10 +672,7 @@ void wxGridCellTextEditor::DoCreate(wxWindow* parent,
                                     wxEvtHandler* evtHandler,
                                     long style)
 {
                                     wxEvtHandler* evtHandler,
                                     long style)
 {

-    style |= wxTE_PROCESS_ENTER |
-             wxTE_PROCESS_TAB |
-             wxTE_AUTO_SCROLL |
-             wxNO_BORDER;
+    style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER;

 
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize,
 
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize,

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index e369cb4f790662e8511c19bf276949d9a6f5c30d..c9ffadfcc910ee6af9ceaa3e81a9eea8622a1361 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -28,7 +28,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
 wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxTE_NO_VSCROLL);
 wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxTE_NO_VSCROLL);

-    XRC_ADD_STYLE(wxTE_AUTO_SCROLL);

     XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
     XRC_ADD_STYLE(wxTE_PROCESS_TAB);
     XRC_ADD_STYLE(wxTE_MULTILINE);
     XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
     XRC_ADD_STYLE(wxTE_PROCESS_TAB);
     XRC_ADD_STYLE(wxTE_MULTILINE);


@@ -48,6 +47,12 @@ wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
 #endif // WXWIN_COMPATIBILITY_2_6
     XRC_ADD_STYLE(wxTE_CHARWRAP);
     XRC_ADD_STYLE(wxTE_WORDWRAP);
 #endif // WXWIN_COMPATIBILITY_2_6
     XRC_ADD_STYLE(wxTE_CHARWRAP);
     XRC_ADD_STYLE(wxTE_WORDWRAP);

+
+    // this style doesn't exist since wx 2.9.0 but we still support it (by
+    // ignoring it silently) in XRC files to avoid unimportant warnings when
+    // using XRC produced by old tools
+    AddStyle(_T("wxTE_AUTO_SCROLL"), 0);
+

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }