Listctrl updates

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index feceacc12e603377a0b111d87e3b3dcfcd2b2cd9..eb7fe290ffda2f96a20edd1d1b9204417a301a64 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -3,9 +3,9 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -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>


@@ -45,51 +45,53 @@ extern const char *wxTextCtrlNameStr;
 
 class wxTextCtrl: public wxControl, public streambuf
 {
 
 class wxTextCtrl: public wxControl, public streambuf
 {

+  DECLARE_EVENT_TABLE()

   DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 
   public:
   DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 
   public:

-  
-    wxTextCtrl(void);
-    wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "", 
+    wxTextCtrl();
+    wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",

       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
       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 );
-    wxString GetValue(void) const;
+      int style = 0, const wxValidator& validator = wxDefaultValidator,
+      const wxString &name = wxTextCtrlNameStr );
+    wxString GetValue() const;

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

-    
+

     bool LoadFile( const wxString &file );
     bool SaveFile( const wxString &file );
     bool LoadFile( const wxString &file );
     bool SaveFile( const wxString &file );

-    bool IsModified(void);
-    void DiscardEdits(void);
-/*
+    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(void);
-*/
+    long XYToPosition( long x, long y ) const;
+    int GetLineLength(long lineNo) const;
+    int GetNumberOfLines() const;

     virtual void SetInsertionPoint( long pos );
     virtual void SetInsertionPoint( long pos );

-    virtual void SetInsertionPointEnd(void);
+    virtual void SetInsertionPointEnd();

     virtual void SetEditable( bool editable );
     virtual void SetSelection( long from, long to );
     void ShowPosition( long pos );
     virtual void SetEditable( bool editable );
     virtual void SetSelection( long from, long to );
     void ShowPosition( long pos );

-    virtual long GetInsertionPoint(void) const;
-    virtual long GetLastPosition(void) const;
+    virtual long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;

     virtual void Remove( long from, long to );
     virtual void Replace( long from, long to, const wxString &value );
     virtual void Remove( long from, long to );
     virtual void Replace( long from, long to, const wxString &value );

-    void Cut(void);
-    void Copy(void);
-    void Paste(void);
-    void Delete(void);
-    
+    void Cut();
+    void Copy();
+    void Paste();
+    void Clear();
+

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

-    
+

     int overflow(int i);
     int overflow(int i);

-    int sync(void);
-    int underflow(void);
+    int sync();
+    int underflow();

 
     wxTextCtrl& operator<<(const wxString& s);
     wxTextCtrl& operator<<(int i);
 
     wxTextCtrl& operator<<(const wxString& s);
     wxTextCtrl& operator<<(int i);


@@ -97,13 +99,21 @@ class wxTextCtrl: public wxControl, public streambuf
     wxTextCtrl& operator<<(float f);
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);
     wxTextCtrl& operator<<(float f);
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);

-    
-  public:
-  
-    bool  m_modified;

 
 

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

     
     

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

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