separator: Don't use padding and borders wrongly

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

diff --git a/gtk/gtkapplicationwindow.h b/gtk/gtkapplicationwindow.h
index 3d658e5010b8678f5ee777ed29402ab3c9177fc0..32fd068f9835c809e98ae6822b9cff8ea3eb8d1e 100644 (file)
--- a/gtk/gtkapplicationwindow.h
+++ b/gtk/gtkapplicationwindow.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/>.
  *
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
@@ -26,21 +24,21 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_APPLICATION_WINDOW                        (gtk_application_window_get_type ())
-#define GTK_APPLICATION_WINDOW(inst)                       (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                            GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindow))
-#define GTK_APPLICATION_WINDOW_CLASS(class)                (G_TYPE_CHECK_CLASS_CAST ((class),                        \
-                                                            GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass))
-#define GTK_IS_APPLICATION_WINDOW(inst)                    (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                            GTK_TYPE_APPLICATION_WINDOW))
-#define GTK_IS_APPLICATION_WINDOW_CLASS(class)             (G_TYPE_CHECK_CLASS_TYPE ((class),                        \
-                                                            GTK_TYPE_APPLICATION_WINDOW))
-#define GTK_APPLICATION_WINDOW_GET_CLASS(inst)             (G_TYPE_INSTANCE_GET_CLASS ((inst),                       \
-                                                            GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass))
+#define GTK_TYPE_APPLICATION_WINDOW            (gtk_application_window_get_type ())
+#define GTK_APPLICATION_WINDOW(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+                                                GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindow))
+#define GTK_APPLICATION_WINDOW_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class),   \
+                                                GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass))
+#define GTK_IS_APPLICATION_WINDOW(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+                                                GTK_TYPE_APPLICATION_WINDOW))
+#define GTK_IS_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class),   \
+                                                GTK_TYPE_APPLICATION_WINDOW))
+#define GTK_APPLICATION_WINDOW_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst),  \
+                                                GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass))
 
-typedef struct _GtkApplicationWindowPrivate                GtkApplicationWindowPrivate;
-typedef struct _GtkApplicationWindowClass                  GtkApplicationWindowClass;
-typedef struct _GtkApplicationWindow                       GtkApplicationWindow;
+typedef struct _GtkApplicationWindowPrivate GtkApplicationWindowPrivate;
+typedef struct _GtkApplicationWindowClass   GtkApplicationWindowClass;
+typedef struct _GtkApplicationWindow        GtkApplicationWindow;
 
 struct _GtkApplicationWindow
 {
@@ -58,14 +56,19 @@ struct _GtkApplicationWindowClass
   gpointer padding[14];
 };
 
-GType                   gtk_application_window_get_type                 (void) G_GNUC_CONST;
-GtkWidget *             gtk_application_window_new                      (GtkApplication       *application);
+GDK_AVAILABLE_IN_3_4
+GType       gtk_application_window_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_3_4
+GtkWidget * gtk_application_window_new               (GtkApplication      *application);
 
-void                    gtk_application_window_set_show_app_menu        (GtkApplicationWindow *window,
-                                                                         gboolean              show_app_menu);
-gboolean                gtk_application_window_get_show_app_menu        (GtkApplicationWindow *window);
+GDK_AVAILABLE_IN_3_4
+void        gtk_application_window_set_show_menubar (GtkApplicationWindow *window,
+                                                     gboolean              show_menubar);
+GDK_AVAILABLE_IN_3_4
+gboolean    gtk_application_window_get_show_menubar (GtkApplicationWindow *window);
 
-GtkWidget *             gtk_application_window_get_app_menu             (GtkApplicationWindow *window);
+GDK_AVAILABLE_IN_3_6
+guint       gtk_application_window_get_id           (GtkApplicationWindow *window);
 
 G_END_DECLS