Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / gtk / textentry.h

diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index 8b47b758e17a6e4c03dbe1045e1b994d4d2f8996..5df686cf246f7f491d996fce6d54bce69bfe236f 100644 (file)
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK-specific wxTextEntry implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-09-24
 // Purpose:     wxGTK-specific wxTextEntry implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-09-24

-// RCS-ID:      $Id$

 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -11,6 +10,7 @@
 #ifndef _WX_GTK_TEXTENTRY_H_
 #define _WX_GTK_TEXTENTRY_H_
 
 #ifndef _WX_GTK_TEXTENTRY_H_
 #define _WX_GTK_TEXTENTRY_H_
 

+typedef struct _GdkEventKey GdkEventKey;

 typedef struct _GtkEditable GtkEditable;
 typedef struct _GtkEntry GtkEntry;
 
 typedef struct _GtkEditable GtkEditable;
 typedef struct _GtkEntry GtkEntry;
 


@@ -50,8 +50,17 @@ public:
 
     // implementation only from now on
     void SendMaxLenEvent();
 
     // implementation only from now on
     void SendMaxLenEvent();

+    bool GTKEntryOnInsertText(const char* text);

 
 protected:
 
 protected:

+    // This method must be called from the derived class Create() to connect
+    // the handlers for the clipboard (cut/copy/paste) events.
+    void GTKConnectClipboardSignals(GtkWidget* entry);
+
+    // And this one to connect "insert-text" signal.
+    void GTKConnectInsertTextSignal(GtkEntry* entry);
+
+

     virtual void DoSetValue(const wxString& value, int flags);
     virtual wxString DoGetValue() const;
 
     virtual void DoSetValue(const wxString& value, int flags);
     virtual wxString DoGetValue() const;
 


@@ -61,6 +70,9 @@ protected:
 
     virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
 
 
     virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
 

+    // Override the base class method to use GtkEntry IM context.
+    virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
+

 private:
     // implement this to return the associated GtkEntry or another widget
     // implementing GtkEditable
 private:
     // implement this to return the associated GtkEntry or another widget
     // implementing GtkEditable