new native toolbar implementation (turned off by default, not supporting embedded...

[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 cd1ce78160b094f14768cc58167765d92cd1b9bf..1727b0051dd2c2bb8bb5daa28da4ba58ce4cc566 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -16,6 +16,14 @@
 #pragma interface "textctrl.h"
 #endif
 
 #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
+    // has more features (backgrounds etc.) but may show redraw artefacts and other 
+    // problems depending on your usage, default is 'false'
+    #define wxMAC_TEXTCONTROL_USE_MLTE _T("mac.textcontrol-use-mlte")
+#endif
+

 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;


@@ -149,14 +157,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 ) ;


@@ -190,6 +203,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()
 };