wxGTK compiles (and seems to work) again after wxMenu changes

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 0222373fe2792a1611608b9c0c03b44ce6254623..c437884c3cfc12d4ac456bbee1e194539e8bb881 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -3,28 +3,16 @@
 // 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

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

-

 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 
 #ifdef __GNUG__
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 
 #ifdef __GNUG__

-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/control.h"
-
-#if USE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
+    #pragma interface "textctrl.h"

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -34,73 +22,124 @@
 class wxTextCtrl;
 
 //-----------------------------------------------------------------------------
 class wxTextCtrl;
 
 //-----------------------------------------------------------------------------

-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxTextCtrlNameStr;
-
-//-----------------------------------------------------------------------------
-//  wxTextCtrl
+// wxTextCtrl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxTextCtrl: public wxControl, public streambuf
+class wxTextCtrl: public wxTextCtrlBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxTextCtrl);
-
-  public:
-  
-    wxTextCtrl(void);
-    wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value = "", 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const int style = 0, const wxString &name = wxTextCtrlNameStr );
-    bool Create( wxWindow *parent, const wxWindowID id, const wxString &value = "", 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const int style = 0, const wxString &name = wxTextCtrlNameStr );
-    wxString GetValue(void) const;
-    void SetValue( const wxString &value );
-    void WriteText( const wxString &text );
-/*
-    wxString GetLineText( const long lineNo ) const;
-    bool LoadFile( const wxString &file );
-    bool SaveFile( const wxString &file );
-    void DiscardEdits(void);
-    bool IsModified(void);
+public:
+    wxTextCtrl();
+    wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
+      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+      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,
+      int style = 0, const wxValidator& validator = wxDefaultValidator,
+      const wxString &name = wxTextCtrlNameStr );
+
+    // implement base class pure virtuals
+    // ----------------------------------
+
+    virtual wxString GetValue() const;
+    virtual void SetValue(const wxString& value);
+
+    virtual int GetLineLength(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const;
+    virtual int GetNumberOfLines() const;
+
+    virtual bool IsModified() const;
+    virtual bool IsEditable() const;
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const;
+
+    // operations
+    // ----------
+
+    // editing
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+
+    // clears the dirty flag
+    virtual void DiscardEdits();
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    virtual long XYToPosition(long x, long y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;
+
+    // Undo/redo
+    virtual void Undo();
+    virtual void Redo();
+
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+
+    // Insertion point
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;
+
+    virtual void SetSelection(long from, long to);
+    virtual void SetEditable(bool editable);
+
+    // Implementation from now on

     void OnDropFiles( wxDropFilesEvent &event );
     void OnDropFiles( wxDropFilesEvent &event );

-    long PositionToXY( const long pos, long *x, long *y ) const;
-    long XYToPosition( const long x, const long y );
-    int GetNumberOfLines(void);
-*/
-    virtual void SetInsertionPoint( const long pos );
-    virtual void SetInsertionPointEnd(void);
-    virtual void SetEditable( const bool editable );
-    virtual void SetSelection( const long from, const long to );
-    void ShowPosition( const long pos );
-    virtual long GetInsertionPoint(void) const;
-    virtual long GetLastPosition(void) const;
-    virtual void Remove( const long from, const long to );
-    virtual void Replace( const long from, const long to, const wxString &value );
-    void Cut(void);
-    void Copy(void);
-    void Paste(void);
-    void Delete(void);
-    

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

-    
-    int overflow(int i);
-    int sync(void);
-    int underflow(void);
-
-    wxTextCtrl& operator<<(const wxString& s);
-    wxTextCtrl& operator<<(const int i);
-    wxTextCtrl& operator<<(const long i);
-    wxTextCtrl& operator<<(const float f);
-    wxTextCtrl& operator<<(const double d);
-    wxTextCtrl& operator<<(const char c);
-
-  DECLARE_EVENT_TABLE()
-    
+
+    void OnCut(wxCommandEvent& event);
+    void OnCopy(wxCommandEvent& event);
+    void OnPaste(wxCommandEvent& event);
+    void OnUndo(wxCommandEvent& event);
+    void OnRedo(wxCommandEvent& event);
+
+    void OnUpdateCut(wxUpdateUIEvent& event);
+    void OnUpdateCopy(wxUpdateUIEvent& event);
+    void OnUpdatePaste(wxUpdateUIEvent& event);
+    void OnUpdateUndo(wxUpdateUIEvent& event);
+    void OnUpdateRedo(wxUpdateUIEvent& event);
+
+    bool SetFont( const wxFont &font );
+    bool SetForegroundColour(const wxColour &colour);
+    bool SetBackgroundColour(const wxColour &colour);
+
+    GtkWidget* GetConnectWidget();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    void CalculateScrollbar();
+    void OnInternalIdle();
+
+    void SetModified() { m_modified = TRUE; }
+
+private:
+    bool        m_modified;
+    GtkWidget  *m_text;
+    GtkWidget  *m_vScrollbar;
+    bool        m_vScrollbarVisible;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl);

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

-