removed virtual modifier from Command handlers, added readonly and color information to textctrls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
64c06a5085
commit
f8d5f1e2b4
@ -76,9 +76,9 @@ public:
|
||||
virtual bool MacCanFocus() const ;
|
||||
|
||||
virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
|
||||
virtual void OnKeyDown( wxKeyEvent &event ) ;
|
||||
virtual void OnMouseEvent( wxMouseEvent &event ) ;
|
||||
virtual void OnPaint(wxPaintEvent& event) ;
|
||||
void OnKeyDown( wxKeyEvent &event ) ;
|
||||
void OnMouseEvent( wxMouseEvent &event ) ;
|
||||
void OnPaint(wxPaintEvent& event) ;
|
||||
virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;
|
||||
WXWidget GetMacControl() { return m_macControl ;}
|
||||
|
||||
|
@ -45,7 +45,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
|
||||
|
||||
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
|
||||
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
|
||||
virtual void OnPaint( wxPaintEvent &event ) ;
|
||||
void OnPaint( wxPaintEvent &event ) ;
|
||||
|
||||
wxBitmap GetBitmap() const { return m_bitmap; }
|
||||
wxIcon GetIcon() const
|
||||
|
@ -78,6 +78,16 @@ public:
|
||||
// clears the dirty flag
|
||||
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) ;
|
||||
|
||||
// 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 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);
|
||||
@ -155,6 +165,7 @@ protected:
|
||||
void* m_macTXN ;
|
||||
void* m_macTXNvars ;
|
||||
bool m_macUsesTXN ;
|
||||
unsigned long m_maxLength ;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user