Fixed a void* to wxObject* conversion error in a return causing compile break across...

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index b480306b089d1f40c93a2aae5dc3565fd0d28ec4..7c18d927dc6d615a7a4dd8f605657ce88a80657c 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -12,7 +12,7 @@
 #define __GTKTEXTCTRLH__
 
 #ifdef __GNUG__
-    #pragma interface
+    #pragma interface "textctrl.h"
 #endif
 
 //-----------------------------------------------------------------------------
@@ -62,10 +62,6 @@ public:
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
 
-    // load/save the controls contents from/to the file
-    virtual bool LoadFile(const wxString& file);
-    virtual bool SaveFile(const wxString& file);
-
     // clears the dirty flag
     virtual void DiscardEdits();
 
@@ -78,7 +74,7 @@ public:
     // 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 void PositionToXY(long pos, long *x, long *y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;
 
     virtual void ShowPosition(long pos);
 
@@ -131,6 +127,12 @@ public:
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     void CalculateScrollbar();
+    void OnInternalIdle();
+
+    void SetModified() { m_modified = TRUE; }
+
+protected:
+    virtual wxSize DoGetBestSize() const;
 
 private:
     bool        m_modified;