cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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'
|
||||
#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"
|
||||
@@ -32,10 +32,7 @@ class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
|
||||
DECLARE_DYNAMIC_CLASS(wxTextCtrl)
|
||||
|
||||
public:
|
||||
// creation
|
||||
// --------
|
||||
wxTextCtrl() { Init(); }
|
||||
~wxTextCtrl();
|
||||
wxTextCtrl(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
@@ -44,10 +41,11 @@ public:
|
||||
const wxString& name = wxTextCtrlNameStr)
|
||||
{
|
||||
Init();
|
||||
|
||||
Create(parent, id, value, pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
@@ -86,8 +84,8 @@ public:
|
||||
virtual void MarkDirty();
|
||||
virtual void DiscardEdits();
|
||||
|
||||
// set the max number of characters which may be entered in a single line
|
||||
// text control
|
||||
// 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
|
||||
@@ -97,8 +95,8 @@ public:
|
||||
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
|
||||
// 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);
|
||||
|
||||
@@ -135,9 +133,6 @@ public:
|
||||
virtual void SetSelection(long from, long to);
|
||||
virtual void SetEditable(bool editable);
|
||||
|
||||
// Implementation from now on
|
||||
// --------------------------
|
||||
|
||||
// Implementation
|
||||
// --------------
|
||||
virtual void Command(wxCommandEvent& event);
|
||||
@@ -168,11 +163,13 @@ public:
|
||||
void OnContextMenu(wxContextMenuEvent& event);
|
||||
|
||||
virtual bool MacCanFocus() const { return true ; }
|
||||
|
||||
virtual bool MacSetupCursor( const wxPoint& pt ) ;
|
||||
|
||||
virtual void MacVisibilityChanged() ;
|
||||
virtual void MacEnabledStateChanged() ;
|
||||
virtual void MacSuperChangedPosition() ;
|
||||
|
||||
#ifndef __WXMAC_OSX__
|
||||
virtual void MacControlUserPaneDrawProc(wxInt16 part) ;
|
||||
virtual wxInt16 MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ;
|
||||
@@ -184,7 +181,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
|
||||
void Init();
|
||||
@@ -198,6 +196,7 @@ protected:
|
||||
|
||||
unsigned long m_maxLength ;
|
||||
// need to make this public because of the current implementation via callbacks
|
||||
|
||||
private :
|
||||
wxMenu *m_privateContextMenu;
|
||||
|
||||
|
Reference in New Issue
Block a user