X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..7921cf2badfac0c44cd53644bfc6a483a09ec299:/include/wx/msw/textctrl.h?ds=sidebyside

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index d0976655ac..3764644be4 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TEXTCTRLH__
-#define __TEXTCTRLH__
+#ifndef _WX_TEXTCTRL_H_
+#define _WX_TEXTCTRL_H_
 
 #ifdef __GNUG__
 #pragma interface "textctrl.h"
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
@@ -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 :-(
 
-#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
 
@@ -44,106 +44,116 @@ class WXDLLEXPORT wxTextCtrl: public wxControl
 
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-
- protected:
-  wxString fileName;
- public:
-  wxTextCtrl(void);
+    
+public:
+  // creation
+  // --------
+  wxTextCtrl();
   inline wxTextCtrl(wxWindow *parent, wxWindowID id,
-           const wxString& value = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxTextCtrlNameStr)
+                    const wxString& value = wxEmptyString,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize, long style = 0,
+                    const wxValidator& validator = wxDefaultValidator,
+                    const wxString& name = wxTextCtrlNameStr)
 #ifndef NO_TEXT_WINDOW_STREAM
- :streambuf()
+    :streambuf()
 #endif
   {
-      Create(parent, id, value, pos, size, style, validator, name);
+    Create(parent, id, value, pos, size, style, validator, name);
   }
-
+  
   bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& value = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxTextCtrlNameStr);
-
-  virtual wxString GetValue(void) const ;
+              const wxString& value = wxEmptyString,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize, long style = wxTE_PROCESS_TAB,
+              const wxValidator& validator = wxDefaultValidator,
+              const wxString& name = wxTextCtrlNameStr);
+  
+  // accessors
+  // ---------
+  virtual wxString GetValue() const ;
   virtual void SetValue(const wxString& value);
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 
-  // Clipboard operations
-  virtual void Copy(void);
-  virtual void Cut(void);
-  virtual void Paste(void);
+  virtual int GetLineLength(long lineNo) const;
+  virtual wxString GetLineText(long lineNo) const;
+  virtual int GetNumberOfLines() const;
 
+  // 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();
+  virtual void Cut();
+  virtual void Paste();
+  
   virtual void SetInsertionPoint(long pos);
-  virtual void SetInsertionPointEnd(void);
-  virtual long GetInsertionPoint(void) const ;
-  virtual long GetLastPosition(void) const ;
+  virtual void SetInsertionPointEnd();
+  virtual long GetInsertionPoint() const ;
+  virtual long GetLastPosition() const ;
   virtual void Replace(long from, long to, const wxString& value);
   virtual void Remove(long from, long to);
   virtual void SetSelection(long from, long to);
-
-  virtual void Command(wxCommandEvent& event);
-
   virtual void SetEditable(bool editable);
-
+  
+  // streambuf implementation
 #ifndef NO_TEXT_WINDOW_STREAM
   int overflow(int i);
-  int sync(void);
-  int underflow(void);
+  int sync();
+  int underflow();
 #endif
-
-  void OnDropFiles(wxDropFilesEvent& event);
-
+  
   wxTextCtrl& operator<<(const wxString& s);
   wxTextCtrl& operator<<(int i);
   wxTextCtrl& operator<<(long i);
   wxTextCtrl& operator<<(float f);
   wxTextCtrl& operator<<(double d);
   wxTextCtrl& operator<<(const char c);
-
+  
   virtual bool LoadFile(const wxString& file);
   virtual bool SaveFile(const wxString& file);
   virtual void WriteText(const wxString& text);
-  virtual void DiscardEdits(void);
-  virtual bool IsModified(void) const;
-
+  virtual void DiscardEdits();
+  virtual bool IsModified() const;
+  
 #if WXWIN_COMPATIBILITY
-  inline bool Modified(void) const { return IsModified(); }
+  inline bool Modified() const { return IsModified(); }
 #endif
-
+  
   virtual long XYToPosition(long x, long y) const ;
   virtual void PositionToXY(long pos, long *x, long *y) const ;
   virtual void ShowPosition(long pos);
-  virtual int GetLineLength(long lineNo) const ;
-  virtual wxString GetLineText(long lineNo) const ;
-  virtual int GetNumberOfLines(void) const ;
-  virtual void Clear(void);
-
-  // Process special keys e.g. 'enter' and process as if it were a command, if required
-  void OnChar(wxKeyEvent& event);
-
+  virtual void Clear();
+  
+  // callbacks
+  // ---------
+  void OnDropFiles(wxDropFilesEvent& event);
+  void OnChar(wxKeyEvent& event); // Process 'enter' if required
   void OnEraseBackground(wxEraseEvent& event);
-
+  
   // Implementation
+  // --------------
+  virtual void Command(wxCommandEvent& event);
   virtual bool MSWCommand(WXUINT param, WXWORD id);
-  inline bool IsRich(void) { return m_isRich; }
+  inline bool IsRich() const { return m_isRich; }
   inline void SetRichEdit(bool isRich) { m_isRich = isRich; }
   virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-			WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
-  virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-  virtual void AdoptAttributesFromHWND(void);
-  virtual void SetupColours(void);
-
+                              WXUINT message, WXWPARAM wParam,
+                              WXLPARAM lParam);
+  
+  virtual void AdoptAttributesFromHWND();
+  virtual void SetupColours();
+  virtual long MSWGetDlgCode();
+  
 protected:
-   bool      m_isRich; // Are we using rich text edit to implement this?
-
-DECLARE_EVENT_TABLE()
+  bool      m_isRich; // Are we using rich text edit to implement this?
+  wxString  m_fileName;
+  
+  DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __TEXTCTRLH__
+    // _WX_TEXTCTRL_H_