gtk: clean up the private horror
- add gtkmodulesprivate.h and move stuff there from gtkprivate.h - add gtkprivate.c and move stuff there from gtkmain.c - add gtkwin32.c and move stuff there from gtkmain.c - don't redefine GTK_DATADIR and friends in gtkprivate.h - have _gtk_get_datadir() and friends on all platforms - remove the horrid hacks where gtkprivate.h can't be included, or must be included later due to redefinition of the compile-time directories
This commit is contained in:
		| @ -27,7 +27,7 @@ | ||||
| #include "gtkmain.h" | ||||
| #include "gtkradiomenuitem.h" | ||||
| #include "gtkintl.h" | ||||
| #include "gtkprivate.h" /* To get redefinition of GTK_LOCALE_DIR on Win32 */ | ||||
| #include "gtkprivate.h" | ||||
|  | ||||
|  | ||||
| /** | ||||
| @ -634,7 +634,7 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context, | ||||
| 	    { | ||||
| 	      /* Same translation domain as GTK+ */ | ||||
| 	      if (!(contexts[i]->domain_dirname && contexts[i]->domain_dirname[0]) || | ||||
| 		  pathnamecmp (contexts[i]->domain_dirname, GTK_LOCALEDIR) == 0) | ||||
| 		  pathnamecmp (contexts[i]->domain_dirname, _gtk_get_localedir ()) == 0) | ||||
| 		{ | ||||
| 		  /* Empty or NULL, domain directory, or same as | ||||
| 		   * GTK+. Input method may have a name in the GTK+ | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Michael Natterer
					Michael Natterer