cleanup - remove duplicate decl., added #include, etc.

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

include/wx/mac/carbon/textctrl.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        textctrl.h
+// Name:        wx/mac/carbon/textctrl.h
 // Purpose:     wxTextCtrl class
 // Author:      Stefan Csomor
 // Modified by:
@@ -13,30 +13,33 @@
 #define _WX_TEXTCTRL_H_
 
 #if wxUSE_SYSTEM_OPTIONS
-    // set this to true if you want to use the 'classic' mlte based implementation
+    // 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
+    // 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 
+    // has more features (backgrounds etc.), but may show redraw artefacts and other
-    // problems depending on your usage, default is 'false'
+    // problems depending on your usage; hence, the default is 'false'.
     #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte")
 #endif
 
 #include "wx/control.h"
-
+#include "wx/textctrl.h"
-WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
 
 class wxMacTextControl;
 
-// Single-line text item
+
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
 public:
-    wxTextCtrl() { Init(); }
+    wxTextCtrl()
-    wxTextCtrl(wxWindow *parent, wxWindowID id,
+    { Init(); }
+
+    wxTextCtrl(wxWindow *parent,
+        wxWindowID id,
         const wxString& value = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize, long style = 0,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxTextCtrlNameStr)
     {
@@ -46,10 +49,12 @@ public:
 
     ~wxTextCtrl();
 
-    bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent,
+        wxWindowID id,
         const wxString& value = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,
-         const wxSize& size = wxDefaultSize, long style = 0,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxTextCtrlNameStr);
 
@@ -72,7 +77,6 @@ public:
     // ----------
 
     // editing
-
     virtual void Clear();
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
@@ -89,7 +93,7 @@ public:
     virtual void SetMaxLength(unsigned long len);
 
     // text control under some platforms supports the text styles: these
-    // methods allow to apply the given text style to the given selection or to
+    // methods apply the given text style to the given selection or to
     // set/get the style which will be used for all appended text
     virtual bool SetFont( const wxFont &font );
     virtual bool SetStyle(long start, long end, const wxTextAttr& style);
@@ -100,7 +104,7 @@ public:
     virtual void WriteText(const wxString& text);
     virtual void AppendText(const wxString& text);
 
-    // translate between the position (which is just an index in the text ctrl
+    // translate between the position (which is just an index into the textctrl
     // considering all its contents as a single strings) and (x, y) coordinates
     // which represent column and line.
     virtual long XYToPosition(long x, long y) const;
@@ -162,7 +166,8 @@ public:
     void OnEraseBackground(wxEraseEvent& event);
     void OnContextMenu(wxContextMenuEvent& event);
 
-    virtual bool MacCanFocus() const { return true ; }
+    virtual bool MacCanFocus() const
+    { return true; }
 
     virtual bool MacSetupCursor( const wxPoint& pt );
 
@@ -181,7 +186,8 @@ public:
     virtual void MacControlUserPaneBackgroundProc(void* info);
 #endif
 
-    wxMacTextControl * GetPeer() const { return (wxMacTextControl*) m_peer; }
+    wxMacTextControl * GetPeer() const
+    { return (wxMacTextControl*) m_peer; }
 
 protected:
     // common part of all ctors
@@ -194,8 +200,8 @@ protected:
     // flag is set to true when the user edits the controls contents
     bool m_dirty;
 
-    unsigned long  m_maxLength ;
   // need to make this public because of the current implementation via callbacks
+    unsigned long  m_maxLength;
 
 private :
   wxMenu  *m_privateContextMenu;
@@ -203,5 +209,4 @@ private :
   DECLARE_EVENT_TABLE()
 };
 
-#endif
+#endif // _WX_TEXTCTRL_H_
-    // _WX_TEXTCTRL_H_