removed hardcoded DoGetBestSize() implementation; added support for textOnly paramete...

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

diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index 41adf503ec7d69d02b782a9540b28016a0cfb235..9f9471fd3d5a9b947461ceac65327f050eaba825 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -12,10 +12,6 @@
 #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
-

 #if wxUSE_SYSTEM_OPTIONS
     // set this to true if you want to use the 'classic' mlte based implementation
     // instead of the HIView based implementation in 10.3 and upwards, the former
 #if wxUSE_SYSTEM_OPTIONS
     // set this to true if you want to use the 'classic' mlte based implementation
     // instead of the HIView based implementation in 10.3 and upwards, the former


@@ -157,14 +153,19 @@ public:
     void OnPaste(wxCommandEvent& event);
     void OnUndo(wxCommandEvent& event);
     void OnRedo(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);
     void OnUndo(wxCommandEvent& event);
     void OnRedo(wxCommandEvent& event);

-
+    void OnDelete(wxCommandEvent& event);
+    void OnSelectAll(wxCommandEvent& event);
+    

     void OnUpdateCut(wxUpdateUIEvent& event);
     void OnUpdateCopy(wxUpdateUIEvent& event);
     void OnUpdatePaste(wxUpdateUIEvent& event);
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
     void OnUpdateCut(wxUpdateUIEvent& event);
     void OnUpdateCopy(wxUpdateUIEvent& event);
     void OnUpdatePaste(wxUpdateUIEvent& event);
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);

+    void OnUpdateDelete(wxUpdateUIEvent& event);
+    void OnUpdateSelectAll(wxUpdateUIEvent& event);

 
     void OnEraseBackground(wxEraseEvent& event) ;
 
     void OnEraseBackground(wxEraseEvent& event) ;

+    void OnContextMenu(wxContextMenuEvent& event);

 
     virtual bool MacCanFocus() const { return true ; }
     virtual bool MacSetupCursor( const wxPoint& pt ) ;
 
     virtual bool MacCanFocus() const { return true ; }
     virtual bool MacSetupCursor( const wxPoint& pt ) ;


@@ -198,6 +199,8 @@ protected:
   unsigned long  m_maxLength ;
   // need to make this public because of the current implementation via callbacks
 private :
   unsigned long  m_maxLength ;
   // need to make this public because of the current implementation via callbacks
 private :

+  wxMenu  *m_privateContextMenu;
+

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };