Minor modifications...

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 99f76a33050f260b40ce4e6dc8016e8498236e47..525b11808fa6041292bd5abeefe37e406aea8d93 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>


@@ -48,14 +48,16 @@ class wxTextCtrl: public wxControl, public streambuf
   DECLARE_EVENT_TABLE()
   DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 
   DECLARE_EVENT_TABLE()
   DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 

-public:
+  public:

     wxTextCtrl();
     wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
     wxTextCtrl();
     wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,

-      int style = 0, const wxString &name = wxTextCtrlNameStr );
+      int style = 0, const wxValidator& validator = wxDefaultValidator,
+      const wxString &name = wxTextCtrlNameStr );

     bool Create( wxWindow *parent, wxWindowID id, const wxString &value = "",
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
     bool Create( wxWindow *parent, wxWindowID id, const wxString &value = "",
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,

-      int style = 0, const wxString &name = wxTextCtrlNameStr );
+      int style = 0, const wxValidator& validator = wxDefaultValidator,
+      const wxString &name = wxTextCtrlNameStr );

     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );
     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );


@@ -65,13 +67,12 @@ public:
     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 );


@@ -84,7 +85,7 @@ public:
     void Cut();
     void Copy();
     void Paste();
     void Cut();
     void Copy();
     void Paste();

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

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


@@ -99,10 +100,18 @@ public:
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);
 
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);
 

-private:
-  bool  m_modified;
-
-  GtkWidget *m_text;
+    void SetFont( const wxFont &font );
+    virtual void SetBackgroundColour(const wxColour &colour);
+
+  // implementation    
+    
+    GtkWidget* GetConnectWidget(void);
+    bool IsOwnGtkWindow( GdkWindow *window );
+    
+  private:
+  
+    bool        m_modified;
+    GtkWidget  *m_text;

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