Updated version to 2.5.5

[wxWidgets.git] / include / wx / mac / classic / textctrl.h

diff --git a/include/wx/mac/classic/textctrl.h b/include/wx/mac/classic/textctrl.h
index f7ec538561527db2548b750f20a89d1150c7bb8c..23bea424baadfdbf1760ccb874b25766bb81d10a 100644 (file)
--- a/include/wx/mac/classic/textctrl.h
+++ b/include/wx/mac/classic/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

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

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


@@ -24,7 +24,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)

-    
+

 public:
   // creation
   // --------
 public:
   // creation
   // --------


@@ -41,14 +41,14 @@ public:
 
       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);
   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 ;
   // accessors
   // ---------
   virtual wxString GetValue() const ;


@@ -107,7 +107,7 @@ public:
   virtual void Copy();
   virtual void Cut();
   virtual void Paste();
   virtual void Copy();
   virtual void Cut();
   virtual void Paste();

-  
+

   virtual bool CanCopy() const;
   virtual bool CanCut() const;
   virtual bool CanPaste() const;
   virtual bool CanCopy() const;
   virtual bool CanCut() const;
   virtual bool CanPaste() const;


@@ -123,7 +123,7 @@ public:
   virtual void SetInsertionPoint(long pos);
   virtual void SetInsertionPointEnd();
   virtual long GetInsertionPoint() const;
   virtual void SetInsertionPoint(long pos);
   virtual void SetInsertionPointEnd();
   virtual long GetInsertionPoint() const;

-  virtual long GetLastPosition() const;
+  virtual wxTextPos GetLastPosition() const;

 
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);
 
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);


@@ -157,7 +157,7 @@ public:
     virtual bool MacSetupCursor( const wxPoint& pt ) ;
 
     virtual void      MacSuperShown( bool show ) ;
     virtual bool MacSetupCursor( const wxPoint& pt ) ;
 
     virtual void      MacSuperShown( bool show ) ;

-    virtual bool     Show(bool show = TRUE) ;
+    virtual bool     Show(bool show = true) ;

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -176,7 +176,7 @@ protected:
   void*  m_macTXNvars ;
   bool  m_macUsesTXN ;
   unsigned long  m_maxLength ;
   void*  m_macTXNvars ;
   bool  m_macUsesTXN ;
   unsigned long  m_maxLength ;

-  
+

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };