wxGraphicsRenderer::CreateContextFromImage is not static

[wxWidgets.git] / include / wx / osx / carbon / private / mactext.h

diff --git a/include/wx/osx/carbon/private/mactext.h b/include/wx/osx/carbon/private/mactext.h
index a0e7d5e5185e33b22d6eb868028e02e9e6de1187..f80834800930c807343594464ac377f3518e0be2 100644 (file)
--- a/include/wx/osx/carbon/private/mactext.h
+++ b/include/wx/osx/carbon/private/mactext.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mactext.h
+// Name:        wx/osx/carbon/private/mactext.h

 // Purpose:     private wxMacTextControl base class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
 // Purpose:     private wxMacTextControl base class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,7 +14,7 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-// implementation exposed, so that search control can pull it 
+// implementation exposed, so that search control can pull it

 
 class wxMacUnicodeTextControl : public wxMacControl, public wxTextWidgetImpl
 {
 
 class wxMacUnicodeTextControl : public wxMacControl, public wxTextWidgetImpl
 {


@@ -26,6 +26,8 @@ public :
                              const wxSize& size, long style ) ;
     virtual ~wxMacUnicodeTextControl();
 
                              const wxSize& size, long style ) ;
     virtual ~wxMacUnicodeTextControl();
 

+    virtual bool CanFocus() const
+                  { return true; }

     virtual void VisibilityChanged(bool shown);
     virtual wxString GetStringValue() const ;
     virtual void SetStringValue( const wxString &str) ;
     virtual void VisibilityChanged(bool shown);
     virtual wxString GetStringValue() const ;
     virtual void SetStringValue( const wxString &str) ;


@@ -43,6 +45,7 @@ protected :
 
     // contains the tag for the content (is different for password and non-password controls)
     OSType m_valueTag ;
 
     // contains the tag for the content (is different for password and non-password controls)
     OSType m_valueTag ;

+    WXEVENTHANDLERREF    m_macTextCtrlEventHandler ;

 public :
     ControlEditTextSelectionRec m_selection ;
 };
 public :
     ControlEditTextSelectionRec m_selection ;
 };