GtkTextView: don't popdown a bubble if we don't have one

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

diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 050fb4846bf8d05adf86498c27c04ef05b2f4a82..5dc792f33dd4a55b720298248c89bb2bc63e477b 100644 (file)
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -12,9 +12,7 @@
  * 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/>.
  */
 
 /*
@@ -24,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_MENU_BAR_H__
 #define __GTK_MENU_BAR_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmenushell.h>
 
 
@@ -45,12 +43,16 @@ G_BEGIN_DECLS
 #define GTK_IS_MENU_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_BAR))
 #define GTK_MENU_BAR_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
 
-typedef struct _GtkMenuBar       GtkMenuBar;
-typedef struct _GtkMenuBarClass  GtkMenuBarClass;
+typedef struct _GtkMenuBar         GtkMenuBar;
+typedef struct _GtkMenuBarPrivate  GtkMenuBarPrivate;
+typedef struct _GtkMenuBarClass    GtkMenuBarClass;
 
 struct _GtkMenuBar
 {
   GtkMenuShell menu_shell;
+
+  /*< private >*/
+  GtkMenuBarPrivate *priv;
 };
 
 struct _GtkMenuBarClass
@@ -67,6 +69,8 @@ struct _GtkMenuBarClass
 
 GType      gtk_menu_bar_get_type        (void) G_GNUC_CONST;
 GtkWidget* gtk_menu_bar_new             (void);
+GDK_AVAILABLE_IN_3_4
+GtkWidget* gtk_menu_bar_new_from_model  (GMenuModel *model);
 
 GtkPackDirection gtk_menu_bar_get_pack_direction (GtkMenuBar       *menubar);
 void             gtk_menu_bar_set_pack_direction (GtkMenuBar       *menubar,