undid last change and removed wxTE/CB_FILENAME style, after looking at GTK+ API it...

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 10e7fb172bd767a925e5da47a79e17c736b15103..9f6a4f3084975c1141703e9c4aaa26ba34c3f478 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -99,7 +99,6 @@ All (GUI):
 - Added wxDC::GradientFillLinear/Concentric().
 - Added wxHyperlinkCtrl (Francesco Montorsi).
 - Added clipboard events (wxEVT_COMMAND_TEXT_COPY/CUT/PASTE).
-- Added wxTE_FILENAME and wxCB_FILENAME (MSW-only for now)
 - Allow to reorder wxGrid columns by drag-and-drop (Santiago Palacios).
 - Added wxRadioBox::SetItemToolTip().
 - Added support for CMYK JPEG images loading (Robert Wruck).

diff --git a/docs/latex/wx/combobox.tex b/docs/latex/wx/combobox.tex
index 3272ba83a26cd3cdc876837bb91ec355c45b7ed4..c74acfe298906d271e15d7b0f559f17123a370f0 100644 (file)
--- a/docs/latex/wx/combobox.tex
+++ b/docs/latex/wx/combobox.tex
@@ -31,9 +31,6 @@ select (even from a program) a string which is not in the choices list.}
 the event wxEVT\_COMMAND\_TEXT\_ENTER (otherwise pressing Enter key
 is either processed internally by the control or used for navigation between
 dialog controls). Windows only.}
-\twocolitem{\windowstyle{wxTE\_FILENAME}}{Should be used for the controls
-containing file names. This currently just enables file names auto-completion
-(and only under Windows for now) but can have other effects in the future.}
 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}.

diff --git a/docs/latex/wx/text.tex b/docs/latex/wx/text.tex
index e44427d4ff6250e2b5f5ddb1d875e7274dbb65a6..599285884395c280a1ef0ba628cc1341e09f4a74 100644 (file)
--- a/docs/latex/wx/text.tex
+++ b/docs/latex/wx/text.tex
@@ -53,9 +53,6 @@ used, so that text won't be wrapped. No effect under wxGTK1.}
 \twocolitem{\windowstyle{wxTE\_WORDWRAP}}{Wrap the lines too long to be shown entirely at word boundaries (wxUniv and wxGTK2 only).}
 \twocolitem{\windowstyle{wxTE\_BESTWRAP}}{Wrap the lines at word boundaries or at any other character if there are words longer than the window width (this is the default).}
 \twocolitem{\windowstyle{wxTE\_CAPITALIZE}}{On PocketPC and Smartphone, causes the first letter to be capitalized.}
-\twocolitem{\windowstyle{wxTE\_FILENAME}}{Should be used for the text controls
-containing file names. This currently just enables file names auto-completion
-(and only under Windows for now) but can have other effects in the future.}
 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles} and \helpref{wxTextCtrl::wxTextCtrl}{wxtextctrlctor}.

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 49d2e48db365305ef7d6195051c2d3a56d03126b..021c098b396faf7258eff3b48fd1b70ecc74661b 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1577,7 +1577,6 @@ enum wxBorder
 #define wxCB_SORT           0x0008
 #define wxCB_READONLY       0x0010
 #define wxCB_DROPDOWN       0x0020
-#define wxCB_FILENAME       0x0040
 
 /*
  * wxRadioBox style flags

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index e6a441fc265d7e15512226aee01a40f632f0257b..9cf2822c602467a78c0cc7593c341bd1139f08ae 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -48,8 +48,7 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxButtonNameStr,
-                    long textstyle = 0);
+                    const wxString& name = wxButtonNameStr);
 
 
 public:     // public API

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 86079e2ded318fabec0af72fdb6ddba823fb3ba2..83dcaeecb4c6801c1d2b116215e3d666a8553835 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -73,7 +73,6 @@ const wxTextCoord wxInvalidTextCoord    = -2;
 // wxTextCtrl style flags
 // ----------------------------------------------------------------------------
 
-#define wxTE_FILENAME       0x0001
 #define wxTE_NO_VSCROLL     0x0002
 #define wxTE_AUTO_SCROLL    0x0008
 

diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index 4d2e59e1c69faaa4b04d1771a9aad6db11d9caa3..5485a1b09fa7c1d64d857b521c2559c40cd20ffa 100644 (file)
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -250,6 +250,7 @@ void ComboboxWidgetsPage::CreateContent()
     m_chkSort = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Sort items"));
     m_chkReadonly = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Read only"));
     m_chkFilename = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&File name"));
+    m_chkFilename->Disable(); // not implemented yet
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
     sizerLeft->Add(m_radioKind, 0, wxGROW | wxALL, 5);
@@ -357,8 +358,6 @@ void ComboboxWidgetsPage::CreateCombo()
         flags |= wxCB_SORT;
     if ( m_chkReadonly->GetValue() )
         flags |= wxCB_READONLY;
-    if ( m_chkFilename->GetValue() )
-        flags |= wxCB_FILENAME;
 
     switch ( m_radioKind->GetSelection() )
     {
@@ -396,6 +395,11 @@ void ComboboxWidgetsPage::CreateCombo()
                                 0, NULL,
                                 flags);
 
+#if 0
+    if ( m_chkFilename->GetValue() )
+        ;
+#endif // TODO
+
     unsigned int count = items.GetCount();
     for ( unsigned int n = 0; n < count; n++ )
     {

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index 7d0536507ac3ad38669a0cf7e39714047949a029..c1e6afb816b134a7c883147651bc865273b4af04 100644 (file)
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -412,6 +412,7 @@ void TextWidgetsPage::CreateContent()
     m_chkFilename = CreateCheckBoxAndAddToSizer(
                         sizerLeft, _T("&Filename control")
                     );
+    m_chkFilename->Disable(); // not implemented yet
     sizerLeft->AddSpacer(5);
 
     static const wxString wrap[] =
@@ -641,8 +642,6 @@ void TextWidgetsPage::CreateText()
         flags |= wxTE_PASSWORD;
     if ( m_chkReadonly->GetValue() )
         flags |= wxTE_READONLY;
-    if ( m_chkFilename->GetValue() )
-        flags |= wxTE_FILENAME;
 
     switch ( m_radioWrap->GetSelection() )
     {
@@ -701,6 +700,11 @@ void TextWidgetsPage::CreateText()
 
     m_text = new WidgetsTextCtrl(this, TextPage_Textctrl, valueOld, flags);
 
+#if 0
+    if ( m_chkFilename->GetValue() )
+        ;
+#endif // TODO
+
     // cast to int needed to silence gcc warning about different enums
     m_sizerText->Add(m_text, 1, wxALL |
                      (flags & wxTE_MULTILINE ? (int)wxGROW

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index 1282f2386d5586ebcf562e16d44b218d2a0fb338..1e85b13f3c7accc4d88627c514b0114d6d436b84 100644 (file)
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -59,7 +59,7 @@ bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
     wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path!"));
 
     if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
-                                   style, validator, name, wxTE_FILENAME))
+                                   style, validator, name))
         return false;
 
     if (!HasFlag(wxFLP_OPEN) && !HasFlag(wxFLP_SAVE))

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index db435a8ecab69e7f9bfb1469b8db040f6c6409c2..cc35df3255f1c4fad72229e941519ce2583fb0e6 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -59,8 +59,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
                          const wxSize& size,
                          long style,
                          const wxValidator& validator,
-                         const wxString& name,
-                         long textstyle)
+                         const wxString& name)
 {
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
@@ -78,7 +77,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         //       the styles related to the textctrl from the styles passed here
         m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                                 wxDefaultPosition, wxDefaultSize,
-                                GetTextCtrlStyle(style) | textstyle);
+                                GetTextCtrlStyle(style));
         if (!m_text)
         {
             wxFAIL_MSG( wxT("wxPickerBase's textctrl creation failed") );

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index 119afc17fe793f5c50fd60627426f8f3a5604afe..6950cfc1988bcd7d775532b06c142261c6273a5e 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -34,7 +34,6 @@ wxComboBoxXmlHandler::wxComboBoxXmlHandler()
     XRC_ADD_STYLE(wxCB_SORT);
     XRC_ADD_STYLE(wxCB_READONLY);
     XRC_ADD_STYLE(wxCB_DROPDOWN);
-    XRC_ADD_STYLE(wxCB_FILENAME);
     AddWindowStyles();
 }
 

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 0fa4c91eb0f77ff78517a2d7d8e0d4729f9ce76e..e369cb4f790662e8511c19bf276949d9a6f5c30d 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -27,7 +27,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
 
 wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
 {
-    XRC_ADD_STYLE(wxTE_FILENAME);
     XRC_ADD_STYLE(wxTE_NO_VSCROLL);
     XRC_ADD_STYLE(wxTE_AUTO_SCROLL);
     XRC_ADD_STYLE(wxTE_PROCESS_ENTER);