use AllocExclusive

[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..09783ec921aec3b0f83e009c58e55f2714b8aa3d 100644 (file)
--- a/include/wx/mac/classic/textctrl.h
+++ b/include/wx/mac/classic/textctrl.h
@@ -6,30 +6,26 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "textctrl.h"
-#endif
-
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-    
+
 public:
   // creation
   // --------
   wxTextCtrl() { Init(); }
-  ~wxTextCtrl();
+  virtual ~wxTextCtrl();
   wxTextCtrl(wxWindow *parent, wxWindowID id,
              const wxString& value = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
@@ -41,14 +37,14 @@ public:
 
       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 ;
@@ -73,9 +69,6 @@ public:
   virtual void Replace(long from, long to, const wxString& value);
   virtual void Remove(long from, long to);
 
-  // load the controls contents from the file
-  virtual bool LoadFile(const wxString& file);
-
   // sets/clears the dirty flag
   virtual void MarkDirty();
   virtual void DiscardEdits();
@@ -107,7 +100,7 @@ public:
   virtual void Copy();
   virtual void Cut();
   virtual void Paste();
-  
+
   virtual bool CanCopy() const;
   virtual bool CanCut() const;
   virtual bool CanPaste() const;
@@ -123,7 +116,7 @@ public:
   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);
@@ -157,7 +150,7 @@ public:
     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
@@ -176,7 +169,7 @@ protected:
   void*  m_macTXNvars ;
   bool  m_macUsesTXN ;
   unsigned long  m_maxLength ;
-  
+
   DECLARE_EVENT_TABLE()
 };