reset m_selection in DeleteAllPages() (patch 1922215); some cleanup of DoRemovePage...

[wxWidgets.git] / include / wx / mac / carbon / private / mactext.h

diff --git a/include/wx/mac/carbon/private/mactext.h b/include/wx/mac/carbon/private/mactext.h
index c61119e3d4a9035bf48f164e8f7a01afe0f3b936..36820b10f905559a6c5cf909f7cd079c573a9b7e 100644 (file)
--- a/include/wx/mac/carbon/private/mactext.h
+++ b/include/wx/mac/carbon/private/mactext.h
@@ -39,10 +39,10 @@ public :
 
 
     virtual bool HasOwnContextMenu() const
-    { return false ; }
+        { return false ; }
 
-    virtual bool SetupCursor( const wxPoint& pt )
-    { return false ; }
+    virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) )
+        { return false ; }
 
     virtual void Clear() ;
     virtual bool CanUndo() const;
@@ -55,22 +55,10 @@ public :
     virtual void ShowPosition(long WXUNUSED(pos)) ;
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
-    virtual void CheckSpelling(bool check) { }
+    virtual void CheckSpelling(bool WXUNUSED(check)) { }
 
-#ifndef __WXMAC_OSX__
-    virtual void            MacControlUserPaneDrawProc(wxInt16 part) = 0 ;
-    virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) = 0 ;
-    virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) = 0 ;
-    virtual void            MacControlUserPaneIdleProc() = 0 ;
-    virtual wxInt16         MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) = 0 ;
-    virtual void            MacControlUserPaneActivateProc(bool activating) = 0 ;
-    virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) = 0 ;
-    virtual void            MacControlUserPaneBackgroundProc(void* info) = 0 ;
-#endif
 } ;
 
-#if TARGET_API_MAC_OSX
-
 class wxMacUnicodeTextControl : public wxMacTextControl
 {
 public :
@@ -102,14 +90,8 @@ protected :
 
     // contains the tag for the content (is different for password and non-password controls)
     OSType m_valueTag ;
-
-    // as the selection tag only works correctly when the control has the focus we have to mirror the
-    // intended value
-    EventHandlerRef m_focusHandlerRef ;
 public :
     ControlEditTextSelectionRec m_selection ;
 };
 
-#endif // TARGET_API_MAC_OSX
-
-#endif // _WX_MAC_PRIVATE_MACTEXT_H_
\ No newline at end of file
+#endif // _WX_MAC_PRIVATE_MACTEXT_H_