support retina display

[wxWidgets.git] / include / wx / osx / textctrl.h

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index aa010f84c19f9bd1010eabfcfd5146b5500eed25..c983eee96457b37d3ee4e0623ff4a31488c9efb0 100644 (file)
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/textctrl.h
+// Name:        wx/osx/textctrl.h

 // Purpose:     wxTextCtrl class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxTextCtrl class
 // Author:      Stefan Csomor
 // Modified by:


@@ -26,9 +26,6 @@
 #include "wx/control.h"
 #include "wx/textctrl.h"
 
 #include "wx/control.h"
 #include "wx/textctrl.h"
 

-// forward decl for wxListWidgetImpl implementation type.
-class WXDLLIMPEXP_FWD_CORE wxTextWidgetImpl;
-

 class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)


@@ -78,9 +75,9 @@ public:
     virtual void MarkDirty();
     virtual void DiscardEdits();
 
     virtual void MarkDirty();
     virtual void DiscardEdits();
 

-    // set the max number of characters which may be entered
-    // in a single line text control
-    virtual void SetMaxLength(unsigned long len);
+    // set the grayed out hint text
+    virtual bool SetHint(const wxString& hint);
+    virtual wxString GetHint() const;

 
     // text control under some platforms supports the text styles: these
     // methods apply the given text style to the given selection or to
 
     // text control under some platforms supports the text styles: these
     // methods apply the given text style to the given selection or to


@@ -99,12 +96,9 @@ public:
     virtual void ShowPosition(long pos);
 
     // overrides so that we can send text updated events
     virtual void ShowPosition(long pos);
 
     // overrides so that we can send text updated events

+    virtual void Copy();

     virtual void Cut();
     virtual void Paste();
     virtual void Cut();
     virtual void Paste();

-    
-    virtual void WriteText(const wxString& text);
-    virtual void Clear();
-    virtual void Remove(long from, long to);

 
     // Implementation
     // --------------
 
     // Implementation
     // --------------


@@ -115,6 +109,7 @@ public:
     // callbacks
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event); // Process 'enter' if required
     // callbacks
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event); // Process 'enter' if required

+    void OnKeyDown(wxKeyEvent& event); // Process clipboard shortcuts

 
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
 
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);


@@ -140,32 +135,26 @@ public:
     virtual void MacSuperChangedPosition();
     virtual void MacCheckSpelling(bool check);
 
     virtual void MacSuperChangedPosition();
     virtual void MacCheckSpelling(bool check);
 

-    virtual wxTextWidgetImpl * GetTextPeer() const;

 protected:
     // common part of all ctors
     void Init();
 
     virtual wxSize DoGetBestSize() const;
 
 protected:
     // common part of all ctors
     void Init();
 
     virtual wxSize DoGetBestSize() const;
 

-    bool  m_editable;
-

     // flag is set to true when the user edits the controls contents
     bool m_dirty;
 
     // flag is set to true when the user edits the controls contents
     bool m_dirty;
 

-  // need to make this public because of the current implementation via callbacks
-    unsigned long  m_maxLength;
-
-    virtual void EnableTextChangedEvents(bool enable)
+    virtual void EnableTextChangedEvents(bool WXUNUSED(enable))

     {
     {

-        m_triggerUpdateEvents = enable;
+        // nothing to do here as the events are never generated when we change
+        // the controls value programmatically anyhow

     }
 
     }
 

-    bool m_triggerUpdateEvents ;
-

 private :
 private :

-  wxMenu  *m_privateContextMenu;
+    wxMenu  *m_privateContextMenu;
+    wxString m_hintString;

 
 

-  DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 #endif // _WX_TEXTCTRL_H_
 };
 
 #endif // _WX_TEXTCTRL_H_