optimized wxHtmlContainerCell - now proceeds layouting only when neccessary (will...

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index b480306b089d1f40c93a2aae5dc3565fd0d28ec4..714222ae0cb785aa65d2b5be107461228db15500 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -12,7 +12,7 @@
 #define __GTKTEXTCTRLH__
 
 #ifdef __GNUG__
 #define __GTKTEXTCTRLH__
 
 #ifdef __GNUG__

-    #pragma interface
+    #pragma interface "textctrl.h"

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


@@ -29,14 +29,23 @@ class wxTextCtrl: public wxTextCtrlBase
 {
 public:
     wxTextCtrl();
 {
 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 );
+    wxTextCtrl(wxWindow *parent,
+               wxWindowID id,
+               const wxString &value = wxEmptyString,
+               const wxPoint &pos = wxDefaultPosition,
+               const wxSize &size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString &name = wxTextCtrlNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString &value = wxEmptyString,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = wxTextCtrlNameStr);

 
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------


@@ -62,10 +71,6 @@ public:
     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);
     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();
 
     // clears the dirty flag
     virtual void DiscardEdits();
 


@@ -78,7 +83,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;
     // 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);
 
 
     virtual void ShowPosition(long pos);
 


@@ -131,6 +136,12 @@ public:
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     void CalculateScrollbar();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     void CalculateScrollbar();

+    void OnInternalIdle();
+
+    void SetModified() { m_modified = TRUE; }
+
+protected:
+    virtual wxSize DoGetBestSize() const;

 
 private:
     bool        m_modified;
 
 private:
     bool        m_modified;