Added missing filed to sample

[wxWidgets.git] / include / wx / gtk / textctrl.h

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 034f218b7b78e528e2532b27c4875e4a86e0fae4..061e82e3bd0e86f48a66fd5c94d31fe770e63420 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -21,7 +21,7 @@
 #include "wx/string.h"
 #include "wx/control.h"
 
 #include "wx/string.h"
 #include "wx/control.h"
 

-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH

 #include <iostream.h>
 #else
 #include <iostream>
 #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; }
     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;
     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 );
     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 Cut();
     void Copy();
     void Paste();

-    void Delete();
+    void Clear();

 
     void OnChar( wxKeyEvent &event );
 
 
     void OnChar( wxKeyEvent &event );
 


@@ -101,13 +100,23 @@ class wxTextCtrl: public wxControl, public streambuf
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);
 
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);
 

-    virtual GtkWidget* GetConnectWidget(void);
-    virtual bool IsOwnGtkWindow( GdkWindow *window );
+    void SetFont( const wxFont &font );
+    void SetForegroundColour(const wxColour &colour);
+    void SetBackgroundColour(const wxColour &colour);
+
+  // implementation    
+    
+    GtkWidget* GetConnectWidget();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    void CalculateScrollbar();

     
   private:
   
     bool        m_modified;
     GtkWidget  *m_text;
     
   private:
   
     bool        m_modified;
     GtkWidget  *m_text;

+    GtkWidget  *m_vScrollbar;
+    bool        m_vScrollbarVisible;

 };
 
 #endif // __GTKTEXTCTRLH__
 };
 
 #endif // __GTKTEXTCTRLH__