Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

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

diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index a8e14fc8645443c8120d49c31d726179ef32b763..cd1ce78160b094f14768cc58167765d92cd1b9bf 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -20,11 +20,13 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 

+class wxMacTextControl ;
+

 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)

-    
+

 public:
   // creation
   // --------
 public:
   // creation
   // --------


@@ -41,14 +43,14 @@ public:
 
       Create(parent, id, value, pos, size, style, validator, name);
   }
 
       Create(parent, id, value, pos, size, style, validator, name);
   }

-  
+

   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 ;
   // accessors
   // ---------
   virtual wxString GetValue() const ;


@@ -108,7 +110,7 @@ public:
   virtual void Copy();
   virtual void Cut();
   virtual void Paste();
   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;


@@ -124,7 +126,7 @@ public:
   virtual void SetInsertionPoint(long pos);
   virtual void SetInsertionPointEnd();
   virtual long GetInsertionPoint() const;
   virtual void SetInsertionPoint(long pos);
   virtual void SetInsertionPointEnd();
   virtual long GetInsertionPoint() const;

-  virtual long GetLastPosition() const;
+  virtual wxTextPos GetLastPosition() const;

 
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);
 
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);


@@ -154,12 +156,15 @@ public:
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 

+    void OnEraseBackground(wxEraseEvent& event) ;
+

     virtual bool MacCanFocus() const { return true ; }
     virtual bool MacSetupCursor( const wxPoint& pt ) ;
 
     virtual void         MacVisibilityChanged() ;
     virtual void         MacEnabledStateChanged() ;
     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) ;
     virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ;
     virtual void            MacControlUserPaneDrawProc(wxInt16 part) ;
     virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ;
     virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ;


@@ -168,24 +173,22 @@ public:
     virtual void            MacControlUserPaneActivateProc(bool activating) ;
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
     virtual void            MacControlUserPaneActivateProc(bool activating) ;
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;

+#endif

 
 

+  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 ;
 
   // flag is set to true when the user edits the controls contents
   bool m_dirty;
 
 
   bool  m_editable ;
 
   // flag is set to true when the user edits the controls contents
   bool m_dirty;
 

-  // one of the following objects is used for representation, the other one is NULL
-  void*  m_macTXN ;

   unsigned long  m_maxLength ;
   // need to make this public because of the current implementation via callbacks
   unsigned long  m_maxLength ;
   // need to make this public because of the current implementation via callbacks

-public :  
-  void*  m_macTXNvars ;

 private :
   DECLARE_EVENT_TABLE()
 };
 private :
   DECLARE_EVENT_TABLE()
 };