X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/868a28262c40a7428d3991ca8a034674814bdb0a..caaa4cfd6779b689d6723e06df23cc23d1799fd3:/include/wx/gtk1/textctrl.h

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index e477a54675..061e82e3bd 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -21,7 +21,7 @@
 #include "wx/string.h"
 #include "wx/control.h"
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
@@ -67,13 +67,12 @@ class wxTextCtrl: public wxControl, public streambuf
     bool IsModified() const { return m_modified; }
     void SetModified() { m_modified = TRUE; }
     void DiscardEdits() { m_modified = FALSE; }
-/*
     wxString GetLineText( long lineNo ) const;
     void OnDropFiles( wxDropFilesEvent &event );
     long PositionToXY( long pos, long *x, long *y ) const;
-    long XYToPosition( long x, long y );
-    int GetNumberOfLines();
-*/
+    long XYToPosition( long x, long y ) const;
+    int GetLineLength(long lineNo) const;
+    int GetNumberOfLines() const;
     virtual void SetInsertionPoint( long pos );
     virtual void SetInsertionPointEnd();
     virtual void SetEditable( bool editable );
@@ -86,7 +85,7 @@ class wxTextCtrl: public wxControl, public streambuf
     void Cut();
     void Copy();
     void Paste();
-    void Delete();
+    void Clear();
 
     void OnChar( wxKeyEvent &event );
 
@@ -102,16 +101,22 @@ class wxTextCtrl: public wxControl, public streambuf
     wxTextCtrl& operator<<(const char c);
 
     void SetFont( const wxFont &font );
-    
+    void SetForegroundColour(const wxColour &colour);
+    void SetBackgroundColour(const wxColour &colour);
+
   // implementation    
     
-    virtual GtkWidget* GetConnectWidget(void);
-    virtual bool IsOwnGtkWindow( GdkWindow *window );
+    GtkWidget* GetConnectWidget();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    void CalculateScrollbar();
     
   private:
   
     bool        m_modified;
     GtkWidget  *m_text;
+    GtkWidget  *m_vScrollbar;
+    bool        m_vScrollbarVisible;
 };
 
 #endif // __GTKTEXTCTRLH__