Compile with builtin ODBC in GTK+ ANSI mode

[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 109fbf394ee9f32c8b16b8766db203a0122b8307..cd1ce78160b094f14768cc58167765d92cd1b9bf 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -26,7 +26,7 @@ class wxMacTextControl ;
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-    
+
 public:
   // creation
   // --------
@@ -43,14 +43,14 @@ public:
 
       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);
-  
+
   // accessors
   // ---------
   virtual wxString GetValue() const ;
@@ -110,7 +110,7 @@ public:
   virtual void Copy();
   virtual void Cut();
   virtual void Paste();
-  
+
   virtual bool CanCopy() const;
   virtual bool CanCut() const;
   virtual bool CanPaste() const;
@@ -126,7 +126,7 @@ public:
   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);
@@ -155,7 +155,7 @@ public:
     void OnUpdatePaste(wxUpdateUIEvent& event);
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
-    
+
     void OnEraseBackground(wxEraseEvent& event) ;
 
     virtual bool MacCanFocus() const { return true ; }
@@ -163,7 +163,8 @@ public:
 
     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) ;
@@ -172,6 +173,7 @@ public:
     virtual void            MacControlUserPaneActivateProc(bool activating) ;
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
+#endif
 
   wxMacTextControl*         GetPeer() const { return (wxMacTextControl*) m_peer ; }
 protected: