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 23bea424baadfdbf1760ccb874b25766bb81d10a..09783ec921aec3b0f83e009c58e55f2714b8aa3d 100644 (file)
--- a/include/wx/mac/classic/textctrl.h
+++ b/include/wx/mac/classic/textctrl.h
@@ -12,13 +12,9 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "textctrl.h"
-#endif
-

 #include "wx/control.h"
 
 #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
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase


@@ -29,7 +25,7 @@ public:
   // creation
   // --------
   wxTextCtrl() { Init(); }
   // creation
   // --------
   wxTextCtrl() { Init(); }

-  ~wxTextCtrl();
+  virtual ~wxTextCtrl();

   wxTextCtrl(wxWindow *parent, wxWindowID id,
              const wxString& value = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
   wxTextCtrl(wxWindow *parent, wxWindowID id,
              const wxString& value = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,


@@ -73,9 +69,6 @@ public:
   virtual void Replace(long from, long to, const wxString& value);
   virtual void Remove(long from, long to);
 
   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();
   // sets/clears the dirty flag
   virtual void MarkDirty();
   virtual void DiscardEdits();