diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-04-13 21:29:11 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-04-13 21:29:11 +0000 |
| commit | a61a5ffe80e24dac108977a869630bef8393ef76 (patch) | |
| tree | 3ba6be03ab1637a16e707b4b4199915e03da8fe3 /gtk | |
| parent | cf1a251f35d27607eb5af24a1f48d33eafc23114 (diff) | |
| download | gdk-pixbuf-a61a5ffe80e24dac108977a869630bef8393ef76.tar.gz | |
Export the gtk_private_signals and gtk_private_n_signals variables, they
2000-04-14 Tor Lillqvist <tml@iki.fi>
* gtk/gtksignal.c: (Win32:) Export the gtk_private_signals and
gtk_private_n_signals variables, they are used by some software,
sigh.
* gtk/gtkrc.c (get_gtk_sysconf_directory): (Win32:) Fetch the
installation directory from the Registry, where the installer
should have put it.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkrc.c | 30 | ||||
| -rw-r--r-- | gtk/gtksignal.c | 9 |
2 files changed, 30 insertions, 9 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index cf97c48ae..aed1588f0 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -251,22 +251,38 @@ static GtkImageLoader image_loader = NULL; gchar * get_gtk_sysconf_directory (void) { + static gboolean been_here = FALSE; static gchar gtk_sysconf_dir[200]; gchar win_dir[100]; + HKEY reg_key = NULL; + DWORD type; + DWORD nbytes = sizeof (gtk_sysconf_dir); + + if (been_here) + return gtk_sysconf_dir; + + been_here = TRUE; + + if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Software\\GNU\\GTk+", 0, + KEY_QUERY_VALUE, ®_key) != ERROR_SUCCESS + || RegQueryValueEx (reg_key, "InstallationDirectory", 0, + &type, gtk_sysconf_dir, &nbytes) != ERROR_SUCCESS + || type != REG_SZ) + { + /* Uh oh. Use the old hard-coded %WinDir%\GTk+ value */ + GetWindowsDirectory (win_dir, sizeof (win_dir)); + sprintf (gtk_sysconf_dir, "%s\\gtk+", win_dir); + } + + if (reg_key != NULL) + RegCloseKey (reg_key); - GetWindowsDirectory (win_dir, sizeof (win_dir)); - sprintf (gtk_sysconf_dir, "%s\\gtk+", win_dir); return gtk_sysconf_dir; } static gchar * get_themes_directory (void) { - /* We really should fetch this from the Registry. The GIMP - * installation program stores the Themes installation - * directory in HKLM\Software\GNU\GTk+\Themes\InstallDirectory. - * Later. - */ static gchar themes_dir[200]; sprintf (themes_dir, "%s\\themes", get_gtk_sysconf_directory ()); diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 97ea7cf1d..00326f483 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -177,8 +177,13 @@ static GtkSignalDestroy global_destroy_notify = NULL; static guint gtk_handler_id = 1; static guint gtk_handler_quark = 0; static GHashTable *gtk_signal_hash_table = NULL; - GtkSignal *_gtk_private_signals = NULL; - guint _gtk_private_n_signals = 0; +#ifdef G_OS_WIN32 +#define EXPORT __declspec(dllexport) +#else +#define EXPORT +#endif +EXPORT GtkSignal *_gtk_private_signals = NULL; +EXPORT guint _gtk_private_n_signals = 0; static GMemChunk *gtk_signal_hash_mem_chunk = NULL; static GMemChunk *gtk_disconnect_info_mem_chunk = NULL; static GtkHandler *gtk_handler_free_list = NULL; |