X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3e65dac0c4e7ad19e3c270caa1e0eea138e5d8d..2aa45cc91981cbf8be5d6c63c3fda99b530cf308:/include/wx/gtk/textctrl.h

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 797c61bc7f..2dc37d8181 100644
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -21,7 +21,7 @@
 #include "wx/string.h"
 #include "wx/control.h"
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
@@ -48,14 +48,16 @@ class wxTextCtrl: public wxControl, public streambuf
   DECLARE_EVENT_TABLE()
   DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 
-public:
+  public:
     wxTextCtrl();
     wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
       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,
-      int style = 0, const wxString &name = wxTextCtrlNameStr );
+      int style = 0, const wxValidator& validator = wxDefaultValidator,
+      const wxString &name = wxTextCtrlNameStr );
     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );
@@ -84,7 +86,7 @@ public:
     void Cut();
     void Copy();
     void Paste();
-    void Delete();
+    void Clear();
 
     void OnChar( wxKeyEvent &event );
 
@@ -99,12 +101,17 @@ public:
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);
 
-    virtual GtkWidget* GetDropTargetWidget(void);
+    void SetFont( const wxFont &font );
     
-private:
-  bool  m_modified;
-
-  GtkWidget *m_text;
+  // implementation    
+    
+    GtkWidget* GetConnectWidget(void);
+    bool IsOwnGtkWindow( GdkWindow *window );
+    
+  private:
+  
+    bool        m_modified;
+    GtkWidget  *m_text;
 };
 
 #endif // __GTKTEXTCTRLH__