Added dde sample; added docs/index.htm

[wxWidgets.git] / include / wx / msw / textctrl.h

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index edc0de5b329c4bd979e5f3bc656d41516ae7f23c..3764644be4852fbf102e5c29c097270ab108e04d 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxTextCtrl: public wxControl
 // it complains about deriving a huge class from the huge class streambuf. !!
 // Also, can't use streambuf if making or using a DLL :-(
 
 // it complains about deriving a huge class from the huge class streambuf. !!
 // Also, can't use streambuf if making or using a DLL :-(
 

-#if (defined(__BORLANDC__) && !defined(__WIN32__)) || defined(__MWERKS__) || defined(_WINDLL) || defined(WXUSINGDLL) || defined(WXMAKINGDLL)
+#if (defined(__BORLANDC__)) || defined(__MWERKS__) || defined(_WINDLL) || defined(WXUSINGDLL) || defined(WXMAKINGDLL)

 #define NO_TEXT_WINDOW_STREAM
 #endif
 
 #define NO_TEXT_WINDOW_STREAM
 #endif
 


@@ -65,7 +65,7 @@ public:
   bool Create(wxWindow *parent, wxWindowID id,
               const wxString& value = wxEmptyString,
               const wxPoint& pos = wxDefaultPosition,
   bool Create(wxWindow *parent, wxWindowID id,
               const wxString& value = wxEmptyString,
               const wxPoint& pos = wxDefaultPosition,

-              const wxSize& size = wxDefaultSize, long style = 0,
+              const wxSize& size = wxDefaultSize, long style = wxTE_PROCESS_TAB,

               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxTextCtrlNameStr);
   
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxTextCtrlNameStr);
   


@@ -81,6 +81,9 @@ public:
   // operations
   // ----------
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   // operations
   // ----------
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }

   
   // Clipboard operations
   virtual void Copy();
   
   // Clipboard operations
   virtual void Copy();