X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf3e0fbd1ff071caa5d929f01ad6ef9a64ee6494..99f73df9b4865aa3276319fb206127da9027fa63:/include/wx/gtk/textctrl.h

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 8844ee99fe..ebc4c18d4a 100644
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -28,15 +28,24 @@ class wxTextCtrl;
 class wxTextCtrl: public wxTextCtrlBase
 {
 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() { Init(); }
+    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
     // ----------------------------------
@@ -103,6 +112,8 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
+    virtual bool Enable( bool enable );
+
     // Implementation from now on
     void OnDropFiles( wxDropFilesEvent &event );
     void OnChar( wxKeyEvent &event );
@@ -127,14 +138,26 @@ public:
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     void CalculateScrollbar();
+    void OnInternalIdle();
+    void UpdateFontIfNeeded();
 
     void SetModified() { m_modified = TRUE; }
 
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    // common part of all ctors
+    void Init();
+
 private:
+    // change the font for everything in this control
+    void ChangeFontGlobally();
+
     bool        m_modified;
     GtkWidget  *m_text;
     GtkWidget  *m_vScrollbar;
     bool        m_vScrollbarVisible;
+    bool        m_updateFont;
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl);