X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkentryprivate.h;h=0cc825a40591f7801f20ff63b7addb70c68ad32a;hb=ca2368dba958d6fecf2fce417307bb9cbbe6eb6b;hp=59f24e6e5ef1e10ae62a32f6c9f50dcf8bfba810;hpb=920e8b434367f9aa8aab306721cc024e66892e2e;p=~andy%2Fgtk

diff --git a/gtk/gtkentryprivate.h b/gtk/gtkentryprivate.h
index 59f24e6e5..0cc825a40 100644
--- a/gtk/gtkentryprivate.h
+++ b/gtk/gtkentryprivate.h
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_ENTRY_PRIVATE_H__
@@ -66,25 +64,26 @@ struct _GtkEntryCompletionPrivate
   guint popup_set_width   : 1;
   guint popup_single_match : 1;
   guint inline_selection   : 1;
+  guint has_grab           : 1;
 
   gchar *completion_prefix;
 
   GSource *check_completion_idle;
 
-  GdkDevice *grab_device;
+  GdkDevice *device;
 };
 
 gboolean _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion);
-void     _gtk_entry_completion_popup        (GtkEntryCompletion *completion,
-                                             GdkDevice          *device);
 void     _gtk_entry_completion_popdown      (GtkEntryCompletion *completion);
-
-void      _gtk_entry_get_borders            (GtkEntry  *entry,
-					     gint      *xborder,
-					     gint      *yborder);
-void     _gtk_entry_effective_inner_border (GtkEntry  *entry,
-					    GtkBorder *border);
-void     _gtk_entry_reset_im_context       (GtkEntry  *entry);
+void     _gtk_entry_completion_connect      (GtkEntryCompletion *completion,
+                                             GtkEntry           *entry);
+void     _gtk_entry_completion_disconnect   (GtkEntryCompletion *completion);
+
+gchar*   _gtk_entry_get_display_text       (GtkEntry *entry,
+                                            gint      start_pos,
+                                            gint      end_pos);
+void     _gtk_entry_get_borders            (GtkEntry  *entry,
+                                            GtkBorder *borders);
 GtkIMContext* _gtk_entry_get_im_context    (GtkEntry  *entry);
 void     _gtk_entry_set_is_cell_renderer   (GtkEntry  *entry,
                                             gboolean   is_cell_renderer);