fix typo in drawing slider ticks; added assert to check for it (slightly modified...

[wxWidgets.git] / include / wx / mac / textctrl.h

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index 2327eec3d563b5eaeddfad7060ad9d6cfdee61be..5c2c753c43d774808fa32c562c0ff0b081ed6780 100644 (file)
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "textctrl.h"
 #endif
 
 #pragma interface "textctrl.h"
 #endif
 


@@ -78,6 +78,16 @@ public:
   // clears the dirty flag
   virtual void DiscardEdits();
 
   // 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);
   // writing text inserts it at the current position, appending always
   // inserts it at the end
   virtual void WriteText(const wxString& text);


@@ -142,7 +152,8 @@ public:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
        virtual bool MacCanFocus() const { return true ; }
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
        virtual bool MacCanFocus() const { return true ; }

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

     virtual void        MacSuperShown( bool show ) ;
     virtual bool        Show(bool show = TRUE) ;
 
     virtual void        MacSuperShown( bool show ) ;
     virtual bool        Show(bool show = TRUE) ;
 


@@ -155,6 +166,7 @@ protected:
   void*  m_macTXN ;
   void*  m_macTXNvars ;
   bool  m_macUsesTXN ;
   void*  m_macTXN ;
   void*  m_macTXNvars ;
   bool  m_macUsesTXN ;

+  unsigned long  m_maxLength ;

   
   DECLARE_EVENT_TABLE()
 };
   
   DECLARE_EVENT_TABLE()
 };