Drop the Motif DND protocol

[~andy/gtk] / gtk / gtkcellrenderercombo.h

diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index ade6b8a4f8e5be7552474540420fb65b790eaff6..52e87eb83392a292af23b0dc8c037ce1360d4af4 100644 (file)
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -12,14 +12,16 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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_CELL_RENDERER_COMBO_H__
 #define __GTK_CELL_RENDERER_COMBO_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkcellrenderertext.h>
 
@@ -32,24 +34,27 @@ G_BEGIN_DECLS
 #define GTK_IS_CELL_RENDERER_COMBO_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_COMBO))
 #define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass))
 
-typedef struct _GtkCellRendererCombo      GtkCellRendererCombo;
-typedef struct _GtkCellRendererComboClass GtkCellRendererComboClass;
+typedef struct _GtkCellRendererCombo              GtkCellRendererCombo;
+typedef struct _GtkCellRendererComboPrivate       GtkCellRendererComboPrivate;
+typedef struct _GtkCellRendererComboClass         GtkCellRendererComboClass;
 
 struct _GtkCellRendererCombo
 {
   GtkCellRendererText parent;
 
-  GtkTreeModel *model;
-  gint          text_column;
-  gboolean      has_entry;
-
   /*< private >*/
-  guint         focus_out_id;
+  GtkCellRendererComboPrivate *priv;
 };
 
 struct _GtkCellRendererComboClass
 {
   GtkCellRendererTextClass parent;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;