removed virtual modifier from Command handlers, added readonly and color information...

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

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index cef07af9c5afc67acd2c41f63af9624a47bfc70f..ab14b598b357507da4ac0e562e75d0f46e0e537b 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -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 ;}
 

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index 67e92e96e6697b34aa227b1ba4c7d5c8684a96fb..f2cbc707309b18c59ab440018e558a882e982c0f 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -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

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index 2327eec3d563b5eaeddfad7060ad9d6cfdee61be..799265855285c34ef7c748a7b04b22f9b517891a 100644 (file)
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -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()
 };