cleanup - reformat

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

diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index 9f9471fd3d5a9b947461ceac65327f050eaba825..a5480b2ffa377dcf9a47b250485b6c052af01e59 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -17,7 +17,7 @@
     // 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'
     // 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")
+    #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte")

 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"


@@ -32,111 +32,106 @@ class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
 public:
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
 public:

-  // creation
-  // --------
-  wxTextCtrl() { Init(); }
-  ~wxTextCtrl();
-  wxTextCtrl(wxWindow *parent, wxWindowID id,
+    wxTextCtrl() { Init(); }
+    wxTextCtrl(wxWindow *parent, wxWindowID id,

              const wxString& value = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxTextCtrlNameStr)
              const wxString& value = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxTextCtrlNameStr)

-  {
-      Init();
+    {
+        Init();
+        Create(parent, id, value, pos, size, style, validator, name);
+    }

 
 

-      Create(parent, id, value, pos, size, style, validator, name);
-  }
+    ~wxTextCtrl();

 
 

-  bool Create(wxWindow *parent, wxWindowID id,
-              const wxString& value = wxEmptyString,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize, long style = 0,
-              const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxTextCtrlNameStr);
+    bool Create(wxWindow *parent, wxWindowID id,
+         const wxString& value = wxEmptyString,
+         const wxPoint& pos = wxDefaultPosition,
+         const wxSize& size = wxDefaultSize, long style = 0,
+         const wxValidator& validator = wxDefaultValidator,
+         const wxString& name = wxTextCtrlNameStr);

 
 

-  // accessors
-  // ---------
-  virtual wxString GetValue() const ;
-  virtual void SetValue(const wxString& value);
+    // accessors
+    // ---------
+    virtual wxString GetValue() const ;
+    virtual void SetValue(const wxString& value);

 
 

-  virtual int GetLineLength(long lineNo) const;
-  virtual wxString GetLineText(long lineNo) const;
-  virtual int GetNumberOfLines() const;
+    virtual int GetLineLength(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const;
+    virtual int GetNumberOfLines() const;

 
 

-  virtual bool IsModified() const;
-  virtual bool IsEditable() const;
+    virtual bool IsModified() const;
+    virtual bool IsEditable() const;

 
 

-  // If the return values from and to are the same, there is no selection.
-  virtual void GetSelection(long* from, long* to) const;
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const;

 
 

-  // operations
-  // ----------
+    // operations
+    // ----------

 
 

-  // editing
+    // editing

 
 

-  virtual void Clear();
-  virtual void Replace(long from, long to, const wxString& value);
-  virtual void Remove(long from, long to);
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);

 
 

-  // load the controls contents from the file
-  virtual bool LoadFile(const wxString& file);
+    // load the controls contents from the file
+    virtual bool LoadFile(const wxString& file);

 
 

-  // sets/clears the dirty flag
-  virtual void MarkDirty();
-  virtual void DiscardEdits();
+    // sets/clears the dirty flag
+    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 max number of characters which may be entered
+    // in a single line text control
+    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
-  // 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);
-  virtual bool SetDefaultStyle(const wxTextAttr& style);
+    // text control under some platforms supports the text styles: these
+    // methods allow to 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);
+    virtual bool SetDefaultStyle(const wxTextAttr& style);

 
 

-  // writing text inserts it at the current position, appending always
-  // inserts it at the end
-  virtual void WriteText(const wxString& text);
-  virtual void AppendText(const wxString& text);
+    // writing text inserts it at the current position;
+    // appending always inserts it at the end
+    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
-  // 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;
-  virtual bool PositionToXY(long pos, long *x, long *y) const;
+    // translate between the position (which is just an index in the text ctrl
+    // 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;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;

 
 

-  virtual void ShowPosition(long pos);
+    virtual void ShowPosition(long pos);

 
 

-  // Clipboard operations
-  virtual void Copy();
-  virtual void Cut();
-  virtual void Paste();
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();

 
 

-  virtual bool CanCopy() const;
-  virtual bool CanCut() const;
-  virtual bool CanPaste() const;
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;

 
 

-  // Undo/redo
-  virtual void Undo();
-  virtual void Redo();
+    // Undo/redo
+    virtual void Undo();
+    virtual void Redo();

 
 

-  virtual bool CanUndo() const;
-  virtual bool CanRedo() const;
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;

 
 

-  // Insertion point
-  virtual void SetInsertionPoint(long pos);
-  virtual void SetInsertionPointEnd();
-  virtual long GetInsertionPoint() const;
-  virtual wxTextPos GetLastPosition() const;
+    // Insertion point
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual wxTextPos GetLastPosition() const;

 
 

-  virtual void SetSelection(long from, long to);
-  virtual void SetEditable(bool editable);
-
-    // Implementation from now on
-    // --------------------------
+    virtual void SetSelection(long from, long to);
+    virtual void SetEditable(bool editable);

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


@@ -168,36 +163,40 @@ public:
     void OnContextMenu(wxContextMenuEvent& event);
 
     virtual bool MacCanFocus() const { return true ; }
     void OnContextMenu(wxContextMenuEvent& event);
 
     virtual bool MacCanFocus() const { return true ; }

+

     virtual bool MacSetupCursor( const wxPoint& pt ) ;
 
     virtual bool MacSetupCursor( const wxPoint& pt ) ;
 

-    virtual void         MacVisibilityChanged() ;
-    virtual void         MacEnabledStateChanged() ;
-    virtual void         MacSuperChangedPosition() ;
+    virtual void MacVisibilityChanged() ;
+    virtual void MacEnabledStateChanged() ;
+    virtual void MacSuperChangedPosition() ;
+

 #ifndef __WXMAC_OSX__
 #ifndef __WXMAC_OSX__

-    virtual void            MacControlUserPaneDrawProc(wxInt16 part) ;
-    virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ;
-    virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ;
-    virtual void            MacControlUserPaneIdleProc() ;
-    virtual wxInt16         MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) ;
-    virtual void            MacControlUserPaneActivateProc(bool activating) ;
-    virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
-    virtual void            MacControlUserPaneBackgroundProc(void* info) ;
+    virtual void MacControlUserPaneDrawProc(wxInt16 part) ;
+    virtual wxInt16 MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ;
+    virtual wxInt16 MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ;
+    virtual void MacControlUserPaneIdleProc() ;
+    virtual wxInt16 MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) ;
+    virtual void MacControlUserPaneActivateProc(bool activating) ;
+    virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action) ;
+    virtual void MacControlUserPaneBackgroundProc(void* info) ;

 #endif
 
 #endif
 

-  wxMacTextControl*         GetPeer() const { return (wxMacTextControl*) m_peer ; }
+    wxMacTextControl * GetPeer() const { return (wxMacTextControl*) m_peer; }
+

 protected:
     // common part of all ctors
     void Init();
 
 protected:
     // common part of all ctors
     void Init();
 

-  virtual wxSize            DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const;

 
 

-  bool  m_editable ;
+    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;

 
 

-  unsigned long  m_maxLength ;
+    unsigned long  m_maxLength ;

   // need to make this public because of the current implementation via callbacks
   // need to make this public because of the current implementation via callbacks

+

 private :
   wxMenu  *m_privateContextMenu;
 
 private :
   wxMenu  *m_privateContextMenu;