Separation of wxUSE_FILEDLG and wxUSE_DIRDLG in generic implementations.

[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 d14d79e406d3b61117c388b7ee3dbe3987fc2b95..7bf124a98a24421fff83f9e8bc662977a4a74d73 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
@@ -173,14 +173,16 @@ 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;
 
-  // one of the following objects is used for representation, the other one is NULL
+  WXWidget                  m_scrollView ;
+  WXWidget                  m_textView ;
+  
   void*  m_macTXN ;
   unsigned long  m_maxLength ;
   // need to make this public because of the current implementation via callbacks