added rtti to tooltip, mlte implementation to textctrl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index d7f946d3d1a6d4e3daef96036bae90e60631f85f..de6f4ba96c6cf587cbaad18250ec9e671b312b4c 100644 (file)
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -30,6 +30,7 @@ public:
   // creation
   // --------
   wxTextCtrl();
+  ~wxTextCtrl();
   inline wxTextCtrl(wxWindow *parent, wxWindowID id,
                     const wxString& value = wxEmptyString,
                     const wxPoint& pos = wxDefaultPosition,
@@ -144,6 +145,13 @@ public:
     
 protected:
   virtual wxSize DoGetBestSize() const;
+
+  bool  m_editable ;
+  // one of the following objects is used for representation, the other one is NULL
+  void*  m_macTE ;
+  void*  m_macTXN ;
+  void*  m_macTXNvars ;
+  bool  m_macUsesTXN ;
   
   DECLARE_EVENT_TABLE()
 };

diff --git a/include/wx/mac/tooltip.h b/include/wx/mac/tooltip.h
index 7398a01e4b694062b4d92c1c555b290da19c335c..bc4bcbef442204a59af85109570bc5a144977e46 100644 (file)
--- a/include/wx/mac/tooltip.h
+++ b/include/wx/mac/tooltip.h
@@ -43,5 +43,6 @@ public:
 private:
     wxString  m_text;           // tooltip text
     wxWindow *m_window;         // window we're associated with
+    DECLARE_ABSTRACT_CLASS(wxToolTip)
 };