changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 44928ded075fd21a6d45108de03da19e9e5c0546..1e47cb75474e737beb195398758eaae494ea02b7 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -6,35 +6,42 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifdef __GNUG__

-#pragma interface "textctrl.h"
+    #pragma interface "textctrl.h"

 #endif
 
 #endif
 

+#include "wx/setup.h"

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-#if USE_IOSTREAMH
-#include <iostream.h>
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>

 #else
 #else

-#include <iostream>
+    #include <iostream>
+#endif
+
+#if defined(__WIN95__) && !defined(__TWIN32__)
+    #define wxUSE_RICHEDIT 1
+#else
+    #define wxUSE_RICHEDIT 0

 #endif
 
 WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // Single-line text item
 #endif
 
 WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // Single-line text item

-class WXDLLEXPORT wxTextCtrl: public wxControl
+class WXDLLEXPORT wxTextCtrl : public wxControl

 
 // 16-bit Borland 4.0 doesn't seem to allow multiple inheritance with wxWindow and streambuf:
 // it complains about deriving a huge class from the huge class streambuf. !!
 // Also, can't use streambuf if making or using a DLL :-(
 
 
 // 16-bit Borland 4.0 doesn't seem to allow multiple inheritance with wxWindow and streambuf:
 // 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
 


@@ -44,112 +51,124 @@ class WXDLLEXPORT wxTextCtrl: public wxControl
 
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)

-    
+

 public:
 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)
+    // creation
+    // --------
+    wxTextCtrl();
+    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)

 #ifndef NO_TEXT_WINDOW_STREAM
 #ifndef NO_TEXT_WINDOW_STREAM

-    :streambuf()
+        :streambuf()

 #endif
 #endif

-  {
-    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);
-  
-  // accessors
-  // ---------
-  virtual wxString GetValue() const ;
-  virtual void SetValue(const wxString& value);
-
-  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);
-  
-  // Clipboard operations
-  virtual void Copy();
-  virtual void Cut();
-  virtual void Paste();
-  
-  virtual void SetInsertionPoint(long pos);
-  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 SetEditable(bool editable);
-  
-  // streambuf implementation
+        {
+            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 = wxTE_PROCESS_TAB,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxTextCtrlNameStr);
+
+    // accessors
+    // ---------
+    virtual wxString GetValue() const ;
+    virtual void SetValue(const wxString& value);
+
+    virtual int GetLineLength(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const;
+    virtual int GetNumberOfLines() const;
+
+    // operations
+    // ----------
+
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+
+    virtual void SetInsertionPoint(long pos);
+    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 SetEditable(bool editable);
+
+    // streambuf implementation

 #ifndef NO_TEXT_WINDOW_STREAM
 #ifndef NO_TEXT_WINDOW_STREAM

-  int overflow(int i);
-  int sync();
-  int underflow();
+    int overflow(int i);
+    int sync();
+    int underflow();

 #endif
 #endif

-  
-  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();
-  virtual bool IsModified() const;
-  
+
+    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 AppendText(const wxString& text);
+    virtual void DiscardEdits();
+    virtual bool IsModified() const;
+

 #if WXWIN_COMPATIBILITY
 #if WXWIN_COMPATIBILITY

-  inline bool Modified() const { return IsModified(); }
+    inline bool Modified() const { return IsModified(); }

 #endif
 #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 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() 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 void AdoptAttributesFromHWND();
-  virtual void SetupColours();
-  virtual long MSWGetDlgCode();
-  
+
+    virtual long XYToPosition(long x, long y) const ;
+    virtual void PositionToXY(long pos, long *x, long *y) const ;
+    virtual void ShowPosition(long pos);
+    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);
+
+#if wxUSE_RICHEDIT
+    bool IsRich() const { return m_isRich; }
+    void SetRichEdit(bool isRich) { m_isRich = isRich; }
+#endif
+
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam,
+            WXLPARAM lParam);
+
+    virtual void AdoptAttributesFromHWND();
+    virtual void SetupColours();
+    virtual long MSWGetDlgCode();
+

 protected:
 protected:

-  bool      m_isRich; // Are we using rich text edit to implement this?
-  wxString  m_fileName;
-  
-  DECLARE_EVENT_TABLE()
+#if wxUSE_RICHEDIT
+    bool      m_isRich; // Are we using rich text edit to implement this?
+#endif
+
+    wxString  m_fileName;
+
+    virtual void DoSetSize(int x, int y,
+            int width, int height,
+            int sizeFlags = wxSIZE_AUTO);
+
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif