Update gtk include headers to follow gtk recommendations (only include gtk/gtk.h)

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20342 57a11ea4-9604-0410-9ed3-97b8803252fd
2025-02-25 18:55:30 -06:00 · 2011-02-26 13:04:37 +00:00
parent f19e1d0d4c
commit cb366864c4
40 changed files with 43 additions and 56 deletions
--- a/src/business/business-gnome/gnc-plugin-business.h
+++ b/src/business/business-gnome/gnc-plugin-business.h
@@ -25,7 +25,7 @@
 #ifndef __GNC_PLUGIN_BUSINESS_H
 #define __GNC_PLUGIN_BUSINESS_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin.h"

--- a/src/business/business-gnome/gnc-plugin-page-invoice.h
+++ b/src/business/business-gnome/gnc-plugin-page-invoice.h
@@ -33,7 +33,7 @@
 #ifndef __GNC_PLUGIN_PAGE_INVOICE_H
 #define __GNC_PLUGIN_PAGE_INVOICE_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "Account.h"
 #include "gnc-ledger-display.h"
--- a/src/gnome-utils/gnc-embedded-window.h
+++ b/src/gnome-utils/gnc-embedded-window.h
@@ -36,7 +36,7 @@
 #ifndef __GNC_EMBEDDED_WINDOW_H
 #define __GNC_EMBEDDED_WINDOW_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin-page.h"

--- a/src/gnome-utils/gnc-keyring.h
+++ b/src/gnome-utils/gnc-keyring.h
@@ -40,7 +40,7 @@
 #define KEYRING_H_

 #include <glib.h>
-#include <gtk/gtk.h> /* For GtkWidget */
+#include <gtk/gtk.h>


 /** Attempt to store a password in some trusted keystore. At this point
--- a/src/gnome-utils/gnc-tree-model-account.h
+++ b/src/gnome-utils/gnc-tree-model-account.h
@@ -36,7 +36,7 @@
 #ifndef __GNC_TREE_MODEL_ACCOUNT_H
 #define __GNC_TREE_MODEL_ACCOUNT_H

-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include "gnc-tree-model.h"

 #include "Account.h"
--- a/src/gnome-utils/gnc-tree-model-commodity.h
+++ b/src/gnome-utils/gnc-tree-model-commodity.h
@@ -36,8 +36,7 @@
 #ifndef __GNC_TREE_MODEL_COMMODITY_H
 #define __GNC_TREE_MODEL_COMMODITY_H

-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeselection.h>
+#include <gtk/gtk.h>
 #include "gnc-tree-model.h"

 #include "gnc-commodity.h"
--- a/src/gnome-utils/gnc-tree-model-price.h
+++ b/src/gnome-utils/gnc-tree-model-price.h
@@ -36,7 +36,7 @@
 #ifndef __GNC_TREE_MODEL_PRICE_H
 #define __GNC_TREE_MODEL_PRICE_H

-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include "gnc-tree-model.h"

 #include "gnc-pricedb.h"
--- a/src/gnome-utils/gnc-tree-model-selection.c
+++ b/src/gnome-utils/gnc-tree-model-selection.c
@@ -25,7 +25,7 @@

 #include "config.h"

-#include <gtk/gtkcellrenderertoggle.h>
+#include <gtk/gtk.h>

 #include "gnc-tree-model-selection.h"

--- a/src/gnome-utils/gnc-tree-model-selection.h
+++ b/src/gnome-utils/gnc-tree-model-selection.h
@@ -37,8 +37,7 @@
 #ifndef __GNC_TREE_MODEL_SELECTION_H
 #define __GNC_TREE_MODEL_SELECTION_H

-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeviewcolumn.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/src/gnome-utils/gnc-tree-model.h
+++ b/src/gnome-utils/gnc-tree-model.h
@@ -35,7 +35,7 @@
 #ifndef __GNC_TREE_MODEL_H
 #define __GNC_TREE_MODEL_H

-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/src/gnome-utils/gnc-tree-view-account.h
+++ b/src/gnome-utils/gnc-tree-view-account.h
@@ -34,8 +34,7 @@
 #ifndef __GNC_TREE_VIEW_ACCOUNT_H
 #define __GNC_TREE_VIEW_ACCOUNT_H

-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "gnc-tree-view.h"

 #include "gnc-ui-util.h"
--- a/src/gnome-utils/gnc-tree-view-commodity.h
+++ b/src/gnome-utils/gnc-tree-view-commodity.h
@@ -34,8 +34,7 @@
 #ifndef __GNC_TREE_VIEW_COMMODITY_H
 #define __GNC_TREE_VIEW_COMMODITY_H

-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "gnc-tree-view.h"

 #include "gnc-commodity.h"
--- a/src/gnome-utils/gnc-tree-view-price.h
+++ b/src/gnome-utils/gnc-tree-view-price.h
@@ -34,8 +34,7 @@
 #ifndef __GNC_TREE_VIEW_PRICE_H
 #define __GNC_TREE_VIEW_PRICE_H

-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "gnc-tree-view.h"

 #include "gnc-pricedb.h"
--- a/src/gnome-utils/gnc-tree-view-sx-list.h
+++ b/src/gnome-utils/gnc-tree-view-sx-list.h
@@ -28,8 +28,7 @@
 #ifndef __GNC_TREE_VIEW_SX_LIST_H
 #define __GNC_TREE_VIEW_SX_LIST_H

-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "gnc-tree-view.h"

 #include "SchedXaction.h"
--- a/src/gnome-utils/gnc-tree-view.h
+++ b/src/gnome-utils/gnc-tree-view.h
@@ -32,8 +32,7 @@
 #ifndef __GNC_TREE_VIEW_H
 #define __GNC_TREE_VIEW_H

-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/src/gnome-utils/gnc-ui.h
+++ b/src/gnome-utils/gnc-ui.h
@@ -36,7 +36,7 @@
 #include "Account.h"
 #include "gnc-pricedb.h"
 #include "guile-mappings.h"
-#include <gtk/gtk.h> /* For GtkWidget */
+#include <gtk/gtk.h>


 /** Help Files ******************************************************/
--- a/src/gnome-utils/gnc-window.h
+++ b/src/gnome-utils/gnc-window.h
@@ -41,7 +41,7 @@
 #ifndef __GNC_WINDOW_H
 #define __GNC_WINDOW_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "gnc-plugin-page.h"

 G_BEGIN_DECLS
--- a/src/gnome-utils/gnctreemodelsort.c
+++ b/src/gnome-utils/gnctreemodelsort.c
@@ -49,16 +49,11 @@ Plus some minor changes that have been annotated with 'CAS:'
 #include <config.h>
 #include <string.h>

-#include "gnctreemodelsort.h"    //CAS: header name changed
-#include "gtk/gtktreesortable.h" //CAS: path changed
-#include "gtk/gtktreestore.h"    //CAS: path changed
+#include "gnctreemodelsort.h"
+#include <gtk/gtk.h>
 #include "gtktreedatalist.h"
-//#include "gtk/gtkintl.h"       //CAS: header commented
-#include "gtk/gtkprivate.h"      //CAS: path changed
-#include "gtk/gtktreednd.h"      //CAS: path changed
-//#include "gtk/gtkalias.h"      //CAS: header commented
-#include <glib/gi18n.h> //CAS: header added
-#define P_(x) _(x)      //CAS: macro added
+#include <glib/gi18n.h>
+#define P_(x) _(x)

 typedef struct _SortElt SortElt;
 typedef struct _SortLevel SortLevel;
--- a/src/gnome-utils/gnctreemodelsort.h
+++ b/src/gnome-utils/gnctreemodelsort.h
@@ -31,8 +31,7 @@ s/gtk_tree_model_sort/gnc_tree_model_sort/g
 #ifndef __GNC_TREE_MODEL_SORT_H__
 #define __GNC_TREE_MODEL_SORT_H__

-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/src/gnome-utils/gtktreedatalist.h
+++ b/src/gnome-utils/gtktreedatalist.h
@@ -25,7 +25,7 @@

 #include <glib.h>
 #include <glib-object.h>
-#include "gtk/gtktreesortable.h" //CAS: changed path
+#include <>gtk/gtk.h>

 typedef struct _GtkTreeDataList GtkTreeDataList;
 struct _GtkTreeDataList
--- a/src/gnome-utils/print-session.c
+++ b/src/gnome-utils/print-session.c
@@ -22,7 +22,7 @@

 #include "config.h"

-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>

 #include "print-session.h"
 #include "gnc-gconf-utils.h" /* for gnc_gconf_set_string() */
--- a/src/gnome-utils/print-session.h
+++ b/src/gnome-utils/print-session.h
@@ -34,7 +34,7 @@
 /** @addtogroup Basic Session Functions
    @{ */

-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>

 /**
 * Retrieve the print settings from the GtkPrintOperation @a op and save them in
--- a/src/gnome/gnc-plugin-account-tree.h
+++ b/src/gnome/gnc-plugin-account-tree.h
@@ -34,7 +34,7 @@
 #ifndef __GNC_PLUGIN_ACCOUNT_TREE_H
 #define __GNC_PLUGIN_ACCOUNT_TREE_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin.h"

--- a/src/gnome/gnc-plugin-basic-commands.h
+++ b/src/gnome/gnc-plugin-basic-commands.h
@@ -33,7 +33,7 @@
 #ifndef __GNC_PLUGIN_BASIC_COMMANDS_H
 #define __GNC_PLUGIN_BASIC_COMMANDS_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin.h"

--- a/src/gnome/gnc-plugin-budget.h
+++ b/src/gnome/gnc-plugin-budget.h
@@ -27,7 +27,7 @@
 #ifndef __GNC_PLUGIN_BUDGET_H
 #define __GNC_PLUGIN_BUDGET_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "gnc-plugin.h"
 #include "gnc-budget.h"

--- a/src/gnome/gnc-plugin-page-account-tree.h
+++ b/src/gnome/gnc-plugin-page-account-tree.h
@@ -35,7 +35,7 @@
 #ifndef __GNC_PLUGIN_PAGE_ACCOUNT_TREE_H
 #define __GNC_PLUGIN_PAGE_ACCOUNT_TREE_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin-page.h"
 #include "Account.h"
--- a/src/gnome/gnc-plugin-page-budget.h
+++ b/src/gnome/gnc-plugin-page-budget.h
@@ -30,7 +30,7 @@
 #ifndef __GNC_PLUGIN_PAGE_BUDGET_H
 #define __GNC_PLUGIN_PAGE_BUDGET_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin-page.h"
 #include "gnc-budget.h"
--- a/src/gnome/gnc-plugin-page-register.h
+++ b/src/gnome/gnc-plugin-page-register.h
@@ -35,7 +35,7 @@
 #ifndef __GNC_PLUGIN_PAGE_REGISTER_H
 #define __GNC_PLUGIN_PAGE_REGISTER_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "Account.h"
 #include "gnc-ledger-display.h"
--- a/src/gnome/gnc-plugin-page-sx-list.h
+++ b/src/gnome/gnc-plugin-page-sx-list.h
@@ -33,7 +33,7 @@

 #include "config.h"
 #include <glib/gi18n.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "SchedXaction.h"
 #include "gnc-plugin-page.h"

--- a/src/gnome/window-reconcile.h
+++ b/src/gnome/window-reconcile.h
@@ -25,7 +25,7 @@
 #define WINDOW_RECONCILE_H

 #include "Account.h"
-#include <gtk/gtk.h> /* For GtkWidget */
+#include <gtk/gtk.h>


 /** STRUCTS *********************************************************/
--- a/src/import-export/csv/gnc-plugin-csv.h
+++ b/src/import-export/csv/gnc-plugin-csv.h
@@ -23,7 +23,7 @@
 #ifndef __GNC_PLUGIN_CSV_H
 #define __GNC_PLUGIN_CSV_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin.h"

--- a/src/import-export/import-account-matcher.h
+++ b/src/import-export/import-account-matcher.h
@@ -26,7 +26,7 @@
 #define ACCOUNT_MATCHER_H

 #include "Account.h"
-#include <gtk/gtk.h> /* For GtkWidget */
+#include <gtk/gtk.h>

 /**  Must be called with a string containing a unique identifier for the
  account.  If an account with a matching online_id kvp_frame is
--- a/src/import-export/log-replay/gnc-plugin-log-replay.h
+++ b/src/import-export/log-replay/gnc-plugin-log-replay.h
@@ -23,7 +23,7 @@
 #ifndef __GNC_PLUGIN_LOG_REPLAY_H
 #define __GNC_PLUGIN_LOG_REPLAY_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin.h"

--- a/src/import-export/ofx/gnc-plugin-ofx.h
+++ b/src/import-export/ofx/gnc-plugin-ofx.h
@@ -23,7 +23,7 @@
 #ifndef __GNC_PLUGIN_OFX_H
 #define __GNC_PLUGIN_OFX_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin.h"

--- a/src/import-export/qif-import/druid-qif-import.h
+++ b/src/import-export/qif-import/druid-qif-import.h
@@ -25,7 +25,7 @@
 #define DIALOG_QIF_IMPORT_H

 #include <libguile.h>
-#include <gtk/gtk.h> /* For GtkWidget */
+#include <gtk/gtk.h>

 /* QIF Import Windows ***********************************************/

--- a/src/import-export/qif-import/gnc-plugin-qif-import.h
+++ b/src/import-export/qif-import/gnc-plugin-qif-import.h
@@ -24,7 +24,7 @@
 #ifndef __GNC_PLUGIN_QIF_IMPORT_H
 #define __GNC_PLUGIN_QIF_IMPORT_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin.h"

--- a/src/register/register-core/basiccell.h
+++ b/src/register/register-core/basiccell.h
@@ -141,7 +141,7 @@

 #include <gdk/gdk.h>
 #include <glib.h>
-#include <gtk/gtk.h> /* For GtkWidget */
+#include <gtk/gtk.h>


 typedef struct basic_cell BasicCell;
--- a/src/register/register-gnome/gnucash-scrolled-window.h
+++ b/src/register/register-gnome/gnucash-scrolled-window.h
@@ -24,7 +24,7 @@
 #ifndef GNC_SCROLLED_WINDOW_H
 #define GNC_SCROLLED_WINDOW_H

-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/src/report/report-gnome/gnc-plugin-page-report.h
+++ b/src/report/report-gnome/gnc-plugin-page-report.h
@@ -34,7 +34,7 @@
 #ifndef __GNC_PLUGIN_PAGE_REPORT_H
 #define __GNC_PLUGIN_PAGE_REPORT_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "gnc-plugin.h"

 G_BEGIN_DECLS
--- a/src/report/stylesheets/gnc-plugin-stylesheets.h
+++ b/src/report/stylesheets/gnc-plugin-stylesheets.h
@@ -23,7 +23,7 @@
 #ifndef __GNC_PLUGIN_STYLESHEETS_H
 #define __GNC_PLUGIN_STYLESHEETS_H

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin.h"