fix typo in last commit

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

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 4556a46d823186d3fa2de2840f5f5149e799157c..e391854724598cf305b6602730d39005b58c6f14 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -1,149 +1,115 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.h
+// Name:        wx/motif/textctrl.h

 // Purpose:     wxTextCtrl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxTextCtrl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

-#ifdef __GNUG__
-#pragma interface "textctrl.h"
-#endif
+// Single-line text item
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
+{
+public:
+    // creation
+    // --------

 
 

-#include "wx/control.h"
+    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)
+    {
+        Create(parent, id, value, pos, size, style, validator, name);
+    }

 
 

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
+    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);

 
 

-WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+    // accessors
+    // ---------
+    virtual wxString GetValue() const;

 
 

-// Single-line text item
-class WXDLLEXPORT wxTextCtrl: public wxControl
+    virtual int GetLineLength(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const;
+    virtual int GetNumberOfLines() const;

 
 

-// TODO Some platforms/compilers don't like inheritance from streambuf.
+    // operations
+    // ----------

 
 

-#if (defined(__BORLANDC__) && !defined(__WIN32__)) || defined(__MWERKS__)
-#define NO_TEXT_WINDOW_STREAM
-#endif
+    virtual void MarkDirty();
+    virtual void DiscardEdits();
+    virtual bool IsModified() const;

 
 

-#ifndef NO_TEXT_WINDOW_STREAM
-, public streambuf
-#endif
+    virtual long XYToPosition(long x, long y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;
+    virtual void ShowPosition(long pos);

 
 

-{
-  DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-    
-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)
-#ifndef NO_TEXT_WINDOW_STREAM
-    :streambuf()
-#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
-  // ----------
-  
-  // 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
-  int overflow(int i);
-  int sync();
-  int underflow();
-#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;
-  
-  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);
-//  void OnEraseBackground(wxEraseEvent& event);
-  
-  // Implementation
-  // --------------
-  virtual void Command(wxCommandEvent& event);
-
-  //// Motif-specific
-  inline void SetModified(bool mod) { m_modified = mod; }
-  virtual WXWidget GetTopWidget() const;
+    // callbacks
+    // ---------
+    void OnDropFiles(wxDropFilesEvent& event);
+    void OnChar(wxKeyEvent& event);
+    //  void OnEraseBackground(wxEraseEvent& event);
+
+    void OnCut(wxCommandEvent& event);
+    void OnCopy(wxCommandEvent& event);
+    void OnPaste(wxCommandEvent& event);
+    void OnUndo(wxCommandEvent& event);
+    void OnRedo(wxCommandEvent& event);
+
+    void OnUpdateCut(wxUpdateUIEvent& event);
+    void OnUpdateCopy(wxUpdateUIEvent& event);
+    void OnUpdatePaste(wxUpdateUIEvent& event);
+    void OnUpdateUndo(wxUpdateUIEvent& event);
+    void OnUpdateRedo(wxUpdateUIEvent& event);
+
+    virtual void Command(wxCommandEvent& event);
+
+    // implementation from here to the end
+    // -----------------------------------
+    virtual void ChangeFont(bool keepOriginalSize = true);
+    virtual void ChangeBackgroundColour();
+    virtual void ChangeForegroundColour();
+    void SetModified(bool mod) { m_modified = mod; }
+    virtual WXWidget GetTopWidget() const;
+
+    // send the CHAR and TEXT_UPDATED events
+    void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,
+                      long keycode);

 
 protected:
 
 protected:

-  wxString  m_fileName;
+    virtual wxSize DoGetBestSize() const;
+
+    virtual void DoSetValue(const wxString& value, int flags = 0);
+
+    virtual WXWidget GetTextWidget() const { return m_mainWidget; }
+

 public:
 public:

-  // Motif-specific
-  void*     m_tempCallbackStruct;
-  bool      m_modified;
-  wxString  m_value; // Required for password text controls
-  bool      m_inSetValue;
-  bool      m_processedDefault; // Did we call wxTextCtrl::OnChar?
-                                // If so, generate a command event.
-  DECLARE_EVENT_TABLE()
+    // Motif-specific
+    void*     m_tempCallbackStruct;
+    bool      m_modified;
+    wxString  m_value;            // Required for password text controls
+
+    // Did we call wxTextCtrl::OnChar? If so, generate a command event.
+    bool      m_processedDefault;
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

 };
 
 #endif
 };
 
 #endif

-    // _WX_TEXTCTRL_H_
+// _WX_TEXTCTRL_H_