Source cleaning: whitespaces & tabs, ::, TRUE/true, FALSE/false.

[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..109fbf394ee9f32c8b16b8766db203a0122b8307 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -20,6 +20,8 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 

+class wxMacTextControl ;
+

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


@@ -153,6 +155,8 @@ public:
     void OnUpdatePaste(wxUpdateUIEvent& event);
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
     void OnUpdatePaste(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 bool MacCanFocus() const { return true ; }
     virtual bool MacSetupCursor( const wxPoint& pt ) ;


@@ -169,23 +173,20 @@ public:
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 

+  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()
 };